Merge with Linux 2.3.21.

12 files changed, 2443 insertions, 1730 deletions

diff --git a/Documentation/Changes b/Documentation/Changes
index d69f5130f..c3c1cb726 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -392,6 +392,8 @@ PPP
    Due to changes in the PPP driver and routing code, those of you
 using PPP networking will need to upgrade your pppd.
 
+See ftp://cs.anu.edu.au/pub/software/ppp/ for newest versions.
+
 iBCS
 ====
 
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 3c6416e8a..7d01fe53e 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -5,29 +5,35 @@
 #
 # Translations of this file available on the WWW:
 #
-#   - Japanese, by Tetsuyasu YAMADA (tetsu@cauchy.nslab.ntt.co.jp), at
-#     http://jf.gee.kyoto-u.ac.jp/JF/JF-ftp/euc/Configure.help.euc
+#   - Japanese, maintained by the JF Project (JF@linux.or.jp), at
+#     http://www.linux.or.jp/JF/JFdocs/Configure.help/
 #   - Russian, by kaf@linux.nevod.perm.su, at
 #     http://nevod.perm.su/service/linux/doc/kernel/Configure.help
-#   - French, by David Bourgin (dbourgin@wsc.com), at
-#     http://www.linux-kheops.com/traduc/kernels/
+#   - French, by Tane Pierre (tanep@bigfoot.com), at
+#     http://www.kernelfr.org
 #   - Spanish, by Carlos Perelló Marín (fperllo@ehome.encis.es), at
 #     http://visar.csustan.edu/~carlos/
 #   - Italian, by Alessandro Rubini (rubini@linux.it), at
 #     ftp://ftp-pavia1.linux.it/pub/linux/Configure.help
 #   - Polish, by Cezar Cichocki (cezar@cs.net.pl), at
 #     http://www.cs.net.pl/~cezar/Kernel
-#   - German, by Jörg Strebel (jstrebel@suse.de) and Karl Eichwalder
-#     (ke@suse.de), at http://www.suse.de/~ke/kernel/Configure.de.help.gz
+#   - German, by SuSE, at http://www.suse.de/~ke/kernel . This patch
+#     includes infrastructure to support different languages as well.
+#
+# To access a document on the WWW, you need to have a direct Internet
+# connection and a browser program such as netscape or lynx. If you
+# only have email access, you can still use FTP and WWW servers: send
+# an email to mail-server@rtfm.mit.edu with the text 
+#   send usenet/news.answers/internet-services/access-via-email 
+# in the body of the message.
 #
 # Information about what a kernel is, what it does, how to patch and
 # compile it and much more is contained in the Kernel-HOWTO, available
-# via FTP (user: anonymous) from metalab.unc.edu in the directory
-# /pub/Linux/docs/HOWTO. Before you start compiling, make sure that
-# you have the necessary versions of all programs and libraries
-# required to compile and run this kernel; they are listed in the file
-# Documentation/Changes. Make sure to read the toplevel kernel README 
-# file as well.
+# at http://metalab.unc.edu/mdw/linux.html#howto . Before you start
+# compiling, make sure that you have the necessary versions of all
+# programs and libraries required to compile and run this kernel; they
+# are listed in the file Documentation/Changes. Make sure to read the
+# toplevel kernel README file as well.
 #
 # Format of this file: description<nl>variable<nl>help text<nl><nl>. If
 # the question being documented is of type "choice", we list only the
@@ -104,9 +110,7 @@ CONFIG_SMP
 
   See also: Documentation/SMP.txt, Documentation/smp.tex,
   Documentation/smp.txt, and Documentation/IO-APIC.txt.  Also see 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 program like lynx or netscape).
+  SMP-FAQ on the WWW at http://www.irisa.fr/prive/mentre/smp-faq/ .
   
   If you don't know what to do here, say N.
   
@@ -126,39 +130,38 @@ CONFIG_MATH_EMULATION
   is broken. Try "man bootparam" or see the documentation of your boot
   loader (lilo or loadlin) about how to pass options to the kernel at
   boot time. The lilo procedure is also explained in the SCSI-HOWTO,
-  available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.) This means that it is a
-  good idea to say Y here if you intend to use this kernel on
-  different machines. 
+  available from http://metalab.unc.edu/mdw/linux.html#howto .) This
+  means that it is a good idea to say Y here if you intend to use this
+  kernel on different machines.
 
   More information about the internals of the Linux math coprocessor
   emulation can be found in arch/i386/math-emu/README.
 
   If you are not sure, say Y; apart from resulting in a 45 KB bigger
   kernel, it won't hurt.
-  
+
 Timer and CPU usage LEDs
 CONFIG_LEDS
-  If you define this option, the LEDs on your machine will be used
+  If you say Y here, the LEDs on your machine will be used
   to provide useful information about your current system status.
 
-  If you are compiling a kernel for a NetWinder or EBSA-285, you
-  will be able to select which LEDs are active using the options
-  below. If you are compiling a kernel for the EBSA-110 however,
-  the red LED will simply flash regularly to indicate that the
-  system is still functional. It is still safe to say yes here if
-  you have a CATS system, but the driver will do nothing.
+  If you are compiling a kernel for a NetWinder or EBSA-285, you will
+  be able to select which LEDs are active using the options below. If
+  you are compiling a kernel for the EBSA-110 however, the red LED
+  will simply flash regularly to indicate that the system is still
+  functional. It is safe to say Y here if you have a CATS system, but
+  the driver will do nothing.
 
 Timer LED
 CONFIG_LEDS_TIMER
-  If you say yes here, one of the system LEDs (the green one on the
+  If you say Y here, one of the system LEDs (the green one on the
   NetWinder or the amber one on the EBSA285) will flash regularly to
   indicate that the system is still operational. This is mainly
   useful to kernel hackers who are debugging unstable kernels.
 
 CPU usage LED
 CONFIG_LEDS_CPU
-  If you say yes here, the red LED will be used to give a good real
+  If you say Y here, the red LED will be used to give a good real
   time indication of CPU usage, by lighting whenever the idle task
   is not currently executing.
 
@@ -170,8 +173,16 @@ CONFIG_MATHEMU
 
 Big memory support
 CONFIG_BIGMEM
-  This option is required if you want to utilize physical memory which
-  is not covered by the kernel virtual address space (> 1GB).
+  Linux can use up to 2 Gigabytes (= 2^31 bytes) of physical memory.
+  If you are compiling a kernel which will never run on a machine with
+  more than 1 Gigabyte, answer N here. Otherwise, say Y.
+
+  The actual amount of physical memory should be specified using a
+  kernel command line option such as "mem=256M". (Try "man bootparam"
+  or see the documentation of your boot loader (lilo or loadlin) about
+  how to pass options to the kernel at boot time. The lilo procedure
+  is also explained in the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
 
 Normal PC floppy disk support
 CONFIG_BLK_DEV_FD
@@ -238,16 +249,16 @@ CONFIG_BLK_DEV_LOOP
   on a remote file server. If you want to do this, you will first have
   to acquire and install a kernel patch from
   ftp://ftp.replay.com/pub/crypto/linux/all or
-  ftp://verden.pvv.org/pub/linux/kerneli/v2.1/, and then you need to
+  ftp://verden.pvv.org/pub/linux/kerneli/v2.1/ , and then you need to
   say Y to this option.
 
   Note that alternative ways to use encrypted filesystems are provided
-  by the cfs package, which can be gotten via FTP (user: anonymous)
-  from ftp://ftp.replay.com/pub/crypto/disk/, and the newer tcfs
-  package, available at http://tcfs.dia.unisa.it/. You do not need to
-  say Y here if you want to use one of these. However, using cfs
-  requires saying Y to "NFS filesystem support" below while using tcfs
-  requires applying a kernel patch.
+  by the cfs package, which can be gotten from
+  ftp://ftp.replay.com/pub/crypto/disk/ , and the newer tcfs package,
+  available at http://tcfs.dia.unisa.it/ . You do not need to say Y
+  here if you want to use one of these. However, using cfs requires
+  saying Y to "NFS filesystem support" below while using tcfs requires
+  applying a kernel patch.
 
   To use the loop device, you need the losetup utility and a recent
   version of the mount program, both contained in the util-linux
@@ -295,8 +306,8 @@ Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support
 CONFIG_BLK_DEV_IDE
   If you say Y here, you will use the full-featured IDE driver to
   control up to eight IDE interfaces, each being able to serve a
-  "master" and a "slave" device, for a total of up to sixteen (16)
-  IDE disk/cdrom/tape/floppy drives.  People with SCSI-only systems
+  "master" and a "slave" device, for a total of up to sixteen IDE
+  disk/cdrom/tape/floppy drives. People with SCSI-only systems
   can say N here.
 
   Useful information about large (>540 MB) IDE disks, multiple
@@ -304,12 +315,11 @@ CONFIG_BLK_DEV_IDE
   detected, 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 and the Multi-Disk-HOWTO,
-  available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
 
   To fine-tune IDE drive/interface parameters for improved
   performance, look for the hdparm package at
-  ftp://metalab.unc.edu/pub/Linux/kernel/patches/diskdrives/
+  ftp://metalab.unc.edu/pub/Linux/kernel/patches/diskdrives/ .
 
   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),
@@ -337,8 +347,8 @@ CONFIG_BLK_DEV_HD_ONLY
 
   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
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  Disk-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   People with SCSI-only systems can say N here.
 
@@ -377,7 +387,7 @@ CONFIG_BLK_DEV_IDEDISK
 
 Use multi-mode by default
 CONFIG_IDEDISK_MULTI_MODE
-  If you get this error, try to enable this option.
+  If you get this error, try to say Y here:
 
   hda: set_multmode: status=0x51 { DriveReady SeekComplete Error }
   hda: set_multmode: error=0x04 { DriveStatusError }
@@ -398,12 +408,12 @@ CONFIG_BLK_DEV_IDECD
   CDROM drive, you can say N to all other CDROM options, but be sure
   to say Y or M to "ISO 9660 CDROM filesystem support".
 
-  Read the CDROM-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO and the file
+  Read the CDROM-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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
-  ftp://metalab.unc.edu/pub/Linux/system/Linux-boot/lilo.
+  ftp://metalab.unc.edu/pub/Linux/system/boot/lilo .
 
   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),
@@ -413,11 +423,11 @@ CONFIG_BLK_DEV_IDECD
 Include CD-Changer Reporting
 CONFIG_IDECD_SLOTS
   If you have an IDE/ATAPI multi-slot cd-changer and you want
-  to report which slots have disk-present, say Y.  If you say Y
-  and there is not a multi-slot cdrom present, this code is skipped.
+  to report which slots have a disk present, say Y.  If you say Y
+  and there is no multi-slot cdrom present, this code is skipped.
 
-  This could be the bases of multi-disk access based on multi-mounts.
-  This is still pie-in-the-sky.
+  This code could be the basis of multi-disk access based on
+  multi-mounts, but this is still pie-in-the-sky.
 
   If unsure, say N.
 
@@ -497,8 +507,8 @@ CONFIG_BLK_DEV_CMD640
   to enable the CMD640 bugfix/support: "ide0=cmd640_vlb". (Try "man
   bootparam" or see the documentation of your boot loader about how to
   pass options to the kernel. The lilo procedure is also explained in
-  the SCSI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.)
+  the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
 
   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
@@ -543,14 +553,56 @@ CONFIG_BLK_DEV_IDEDMA_PCI
   enabled automatically. By default, DMA is not enabled automatically
   for these drives, but you can change that by saying Y to the
   following question "Use DMA by default when available". You can get
-  the latest version of the hdparm utility via anonymous FTP from
-  ftp://metalab.unc.edu/pub/Linux/system/hardware/.
+  the latest version of the hdparm utility from
+  ftp://metalab.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.
 
+Good-Bad DMA Model-Firmware (EXPERIMENTAL)
+IDEDMA_NEW_DRIVE_LISTINGS
+  If you say Y here, the model and firmware revision of your drive
+  will be compared against a blacklist of buggy drives that claim to
+  be (U)DMA capable but aren't. This is a blanket on/off test with no
+  speed limit options.
+
+  Straight GNU GCC 2.7.3/2.8.X compilers are known to be safe;
+  whereas, many versions of EGCS have a problem and miscompile if you
+  say Y here.
+
+  If in doubt, say N.
+
+Winbond SL82c105 support
+CONFIG_BLK_DEV_SL82C105
+  If you have a Winbond SL82c105 IDE controller, say Y here to enable
+  special configuration for this chip. This is common on various CHRP
+  motherboards, but could be used elsewhere. If in doubt, say Y.
+
+Boot off-board chipsets first support
+CONFIG_BLK_DEV_OFFBOARD
+  Normally, IDE controllers built into the motherboard (on-board
+  controllers) are assigned to ide0 and ide1 while those on add-in PCI
+  cards (off-board controllers) are relegated to ide2 and ide3.
+  Answering Y here will allow you to reverse the situation, with
+  off-board controllers on ide0/1 and on-board controllers on ide2/3.
+  This can improve the usability of some boot managers such as LILO
+  when booting from a drive on an off-board controller.
+
+  If you say Y here, and you actually want to reverse the device scan
+  order as explained above, you also need to issue the kernel command
+  line option "pci=reverse". (Try "man bootparam" or see the
+  documentation of your boot loader (lilo or loadlin) about how to
+  pass options to the kernel at boot time. The lilo procedure is also
+  explained in the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
+
+  Note that, if you do this, the order of the hd* devices will be
+  rearranged which may require modification of fstab and other files.
+
+  If in doubt, say N.
+
 Use DMA by default when available
 CONFIG_IDEDMA_PCI_AUTO
   Prior to kernel version 2.1.112, Linux used to automatically use
@@ -565,42 +617,110 @@ CONFIG_IDEDMA_PCI_AUTO
   It is normally safe to answer Y to this question unless your
   motherboard uses a VIA VP2 chipset, in which case you should say N.
 
-Good-Bad DMA Model-Firmware (EXPERIMENTAL)
-IDEDMA_NEW_DRIVE_LISTINGS
-  This test compares both the model and firmware revision for buggy drives
-  that claim to (U)DMA capable.  This is a blanket on/off test with no speed
-  limit options.  Straight GNU GCC 2.7.3/2.8.X compilers are known to be safe;
-  whereas, many versions of EGCS have a problem and miscompile.
+Other IDE chipset support
+CONFIG_IDE_CHIPSETS
+  Say Y here if you want to include enhanced support for various IDE
+  interface chipsets used on motherboards and add-on cards. You can
+  then pick your particular IDE chip from among the following options.
+  This enhanced support may be necessary for Linux to be able to
+  access the 3rd/4th drives in some systems. It may also enable
+  setting of higher speed I/O rates to improve system performance with
+  these chipsets. Most of these also require special kernel boot
+  parameters to actually turn on the support at runtime; you can find
+  a list of these in the file Documentation/ide.txt.
+  
+  People with SCSI-only systems can say N here. 
 
-  If in doubt, say N.
+Generic 4 drives/port support
+CONFIG_BLK_DEV_4DRIVES
+  Certain older chipsets, including the Tekram 690CD, use a single set
+  of I/O ports at 0x1f0 to control up to four drives, instead of the
+  customary two drives per port. Support for this can be enabled at
+  runtime using the "ide0=four" kernel boot parameter if you say Y
+  here.
 
-Boot off-board chipsets first support
-CONFIG_BLK_DEV_OFFBOARD
-  Normally, IDE controllers built into the motherboard (on-board
-  controllers) are assigned to ide0 and ide1 while those on add-in PCI
-  cards (off-board controllers) are relegated to ide2 and ide3.
-  Answering Y here will reverse the situation, with off-board
-  controllers on ide0/1 and on-board controllers on ide2/3. This can
-  improve the usability of some boot managers such as LILO when
-  booting from a drive on an off-board controller.
+DTC-2278 support
+CONFIG_BLK_DEV_DTC2278
+  This driver is enabled at runtime using the "ide0=dtc2278" kernel
+  boot parameter. It enables support for the secondary IDE interface
+  of the DTC-2278 card, and permits faster I/O speeds to be set as
+  well. See the Documentation/ide.txt and drivers/block/dtc2278.c
+  files for more info.
 
-  Requires that all onboard ide controllers be disabled or calling
-  "pci=reverse" to invert the device scan order.
+Holtek HT6560B support
+CONFIG_BLK_DEV_HT6560B
+  This driver is enabled at runtime using the "ide0=ht6560b" kernel
+  boot parameter. It enables support for the secondary IDE interface
+  of the Holtek card, and permits faster I/O speeds to be set as well.
+  See the Documentation/ide.txt and drivers/block/ht6560b.c files for
+  more info.
 
-  Note that, if you say Y here, the order of the hd* devices will be
-  rearranged which may require modification of fstab and other files.
+PROMISE DC4030 support (EXPERIMENTAL)
+CONFIG_BLK_DEV_PDC4030
+  This driver provides support for the secondary IDE interface and
+  cache of Promise IDE chipsets, e.g. DC4030 and DC5030. This driver
+  is known to incur timeouts/retries during heavy I/O to drives
+  attached to the secondary interface. CDROM and TAPE devices are not
+  supported yet. This driver is enabled at runtime using the
+  "ide0=dc4030" kernel boot parameter. See the Documentation/ide.txt
+  and drivers/block/pdc4030.c files for more info.
 
-  If in doubt, say N.
+PS/2 ESDI hard disk support
+CONFIG_BLK_DEV_PS2
+  Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
+  hard disk.
+  
+  If you want to compile the driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called ps2esdi.o.
 
-AEC6210 chipset support
-CONFIG_BLK_DEV_AEC6210
-  This driver adds up to 4 more eide devices sharing a single interrupt.
-  This add-on card is a bootable PCI UDMA controller.  In order to get this
-  card to initialize correctly in some cases, you should include this driver.
+Tekram TRM290 chipset support (EXPERIMENTAL)
+CONFIG_BLK_DEV_TRM290
+  This driver adds support for bus master DMA transfers
+  using the Tekram TRM290 PCI IDE chip. Volunteers are
+  needed for further tweaking and development.
+  Please read the comments at the top of drivers/block/trm290.c.
 
-  This prefers CONFIG_IDEDMA_PCI_AUTO to be enabled, regardless.
+OPTi 82C621 enhanced support (EXPERIMENTAL)
+CONFIG_BLK_DEV_OPTI621
+  This is a driver for the OPTi 82C621 EIDE controller.
+  Please read the comments at the top of drivers/block/opti621.c.
 
-  Please read the comments at the top of drivers/block/aec6210.c
+NS87415 support (EXPERIMENTAL)
+CONFIG_BLK_DEV_NS87415
+  This driver adds detection and support for the NS87415 chip
+  (used in SPARC64, among others).
+
+  Please read the comments at the top of drivers/block/ns87415.c.
+
+CY82C693 chipset support (EXPERIMENTAL)
+CONFIG_BLK_DEV_CY82C693
+  This driver adds detection and support for the CY82C693 chipset
+  used on Digital's PC-Alpha 164SX boards.
+
+  If you say Y here, you need to say Y to "Use DMA by default
+  when available" as well.
+
+VIA82C586 chipset support (EXPERIMENTAL)
+CONFIG_BLK_DEV_VIA82C586
+  Saying Y here adds initial timing settings for VIA (U)DMA onboard
+  IDE controllers that are ATA3 compliant. May work with ATA4 systems,
+  but not tested to date. To use some features of this chipset, you
+  will have to issue a kernel command line as described in the file
+  drivers/block/via82c586.c. Furthermore, if you also say Y to "/proc
+  filesystem support" and set DISPLAY_APOLLO_TIMINGS in via82c586.c,
+  you will be able to read information about the IDE controller from
+  the virtual file /proc/ide/via.
+
+  If you say Y here, you also need to say Y to "Use DMA by default
+  when available", above.
+
+  If unsure, say N.
+
+CMD646 chipset support (EXPERIMENTAL)
+CONFIG_BLK_DEV_CMD646
+  Say Y here if you have an IDE controller which uses this chipset.
 
 ALI M15x3 chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_ALI15X3
@@ -608,52 +728,78 @@ CONFIG_BLK_DEV_ALI15X3
   onboard chipsets.  It also tests for Simplex mode and enables
   normal dual channel support.
 
-  This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
+  If you say Y here, you also need to say Y to "Use DMA by default
+  when available", above.
 
   Please read the comments at the top of drivers/block/alim15x3.c
 
   If unsure, say N.
 
-CMD646 chipset support (EXPERIMENTAL)
-CONFIG_BLK_DEV_CMD646
-  Say Y here if you have an IDE controller like this.
+PROMISE PDC20246/PDC20262 support
+CONFIG_BLK_DEV_PDC202XX
+  Promise Ultra33 or PDC20246
 
-CY82C693 chipset support (EXPERIMENTAL)
-CONFIG_BLK_DEV_CY82C693
+  This driver adds up to 4 more EIDE devices sharing a single
+  interrupt. This add-on card is a bootable PCI UDMA controller. Since
+  multiple cards can be installed and there are BIOS ROM problems that
+  happen if the BIOS revisions of all installed cards (three-max) do
+  not match, the driver attempts to do dynamic tuning of the chipset at
+  boot-time for max-speed. Ultra33 BIOS 1.25 or newer is required for
+  more than one card. This card may require that you say Y to "Special
+  UDMA Feature (EXPERIMENTAL)".
 
-  This driver adds detection and support for the CY82C693 chipset
-  used on Digital's PC-Alpha 164SX boards.
+  Promise Ultra66 or PDC20262
 
-  This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
+  This driver adds up to 4 more EIDE devices sharing a single
+  interrupt. This add-on card is a bootable PCI UDMA ATA-66
+  controller. The driver attempts to dynamic tuning of the chipset at
+  boot-time for max-speed. Note tested limits are UDMA-2. Ultra66 BIOS
+  1.11 or newer required.
 
-  Please read the comments at the top of drivers/block/cy82c693.c
+  If you say Y here, you need to say Y to "Use DMA by default when
+  available" as well.
 
-HPT34X chipset support
-CONFIG_BLK_DEV_HPT34X
-  This driver adds up to 4 more EIDE devices sharing a single
-  interrupt. The HPT343 chipset in its current form is a non-bootable or
-  HPT345/HPT363 chipset is bootable (needs BIOS FIX) PCI UDMA controllers.
-  This driver requires dynamic tuning of the chipset during the ide-probe
-  at boot. It is reported to support DVD II drives, by the manufacturer.
+  Please read the comments at the top of drivers/block/pdc202xx.c
 
-  Please read the comments at the top of drivers/block/hpt34x.c
+  If unsure, say N.
 
-HPT34X DMA support (DANGEROUS)
-CONFIG_BLK_DEV_HPT34X_DMA
-  This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
+Special UDMA Feature (EXPERIMENTAL)
+PDC202XX_FORCE_BURST_BIT
+  For PDC20246 and PDC20262 Ultra DMA chipsets. Designed originally
+  for PDC20246/Ultra33 that has BIOS setup failures when using 3 or
+  more cards.
+
+  Please read the comments at the top of drivers/block/pdc202xx.c
+
+  If unsure, say N.
+
+Special Mode Feature (DANGEROUS)
+PDC202XX_FORCE_MASTER_MODE
+  For PDC20246 and PDC20262 Ultra DMA chipsets. This is reserved for
+  possible Hardware RAID 0,1 for the FastTrak Series.
+
+  Say N. 
+
+AEC6210 chipset support
+CONFIG_BLK_DEV_AEC6210
+  This driver adds up to 4 more EIDE devices sharing a single
+  interrupt. This add-on card is a bootable PCI UDMA controller. In
+  order to get this card to initialize correctly in some cases, you
+  should say Y here, and preferably also to "Use DMA by default when
+  available".
 
-  Please read the comments at the top of drivers/block/hpt34x.c
+  Please read the comments at the top of drivers/block/aec6210.c
 
 HPT366 chipset support
 CONFIG_BLK_DEV_HPT366
   This is an Ultra DMA chipset for ATA-66.
+  
   This driver adds up to 4 more EIDE devices sharing a single
   interrupt. The HPT366 chipset in its current form is a non-bootable.
-  This driver requires dynamic tuning of the chipset during the ide-probe
-  at boot. It is reported to support DVD II drives, by the manufacturer.
-
-  Please read the comments at the top of drivers/block/hpt366.c
-
+  This driver requires dynamic tuning of the chipset during the
+  ide-probe at boot. It is reported to support DVD II drives, by the
+  manufacturer.
+ 
 Intel PIIXn chipsets support
 CONFIG_BLK_DEV_PIIX
   This driver adds PIO mode setting and tuning for all PIIX IDE
@@ -667,107 +813,94 @@ CONFIG_BLK_DEV_PIIX
 
 PIIXn Tuning support (EXPERIMENTAL)
 CONFIG_BLK_DEV_PIIX_TUNING
-  This driver extension adds DMA mode setting and tuning for all PIIX IDE
-  controllers by Intel.  Since the BIOS can sometimes improperly setup
-  the device/adapter combination and speed limits, It has become a necessity
-  to back/forward speed devices as needed.
-
-  Case 430HX/440FX PIIX3 need speed limits to reduce UDMA to DMA mode 2
-  if the BIOS can to perform this task at INIT.
-
-  If unsure, say N.
-
-NS87415 support (EXPERIMENTAL)
-CONFIG_BLK_DEV_NS87415
-  This driver adds detection and support for the NS87415 chip
-  (used in SPARC64, among others).
-
-  Please read the comments at the top of drivers/block/ns87415.c.
+  This driver extension adds DMA mode setting and tuning for all PIIX
+  IDE controllers by Intel. Since the BIOS can sometimes improperly
+  set up the device/adapter combination and speed limits, it has
+  become a necessity to back/forward speed devices as needed.
 
-OPTi 82C621 enhanced support (EXPERIMENTAL)
-CONFIG_BLK_DEV_OPTI621
-  This is a driver for the OPTi 82C621 EIDE controller.
-  Please read the comments at the top of drivers/block/opti621.c.
-
-PROMISE PDC20246/PDC20262 support
-CONFIG_BLK_DEV_PDC202XX
-  Promise Ultra33 or PDC20246.
-  This driver adds up to 4 more eide devices sharing a single interrupt.
-  This add-on card is a bootable PCI UDMA controller.
-  Since multiple cards can be installed and there are BIOS ROM problems
-  that happen if the BIOS revisions of all installed cards (three-max)
-  do not match.  Should you be unable to make new BIOS chips with a burner,
-  the driver attempts to dynamic tuning of the chipset at boot-time
-  for max-speed.  Ultra33 BIOS 1.25 or new required for more than one card.
-  This card may require "PDC202XX Special UDMA Feature (EXPERIMENTAL)".
-
-  Promise Ultra66 or PDC20262.
-  This driver adds up to 4 more eide devices sharing a single interrupt.
-  This add-on card is a bootable PCI UDMA ATA-66 controller.
-  The driver attempts to dynamic tuning of the chipset at boot-time
-  for max-speed.  Note tested limits are UDMA-2.
-  Ultra66 BIOS 1.11 or newer required.
-
-  This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
-
-  Please read the comments at the top of drivers/block/pdc202xx.c
+  Case 430HX/440FX PIIX3 need speed limits to reduce UDMA to DMA mode
+  2 if the BIOS can not perform this task at initialization.
 
   If unsure, say N.
 
-Special UDMA Feature (EXPERIMENTAL)
-PDC202XX_FORCE_BURST_BIT
-  For PDC20246 and PDC20262 Ultra DMA chipsets.
-  Designed originally for PDC20246/Ultra33 that has BIOS setup failures
-  when using 3 or more cards.
+HPT34X chipset support
+CONFIG_BLK_DEV_HPT34X
+  This driver adds up to 4 more EIDE devices sharing a single
+  interrupt. The HPT343 chipset in its current form is a non-bootable
+  controller; the HPT345/HPT363 chipset is a bootable (needs BIOS FIX)
+  PCI UDMA controllers. This driver requires dynamic tuning of the
+  chipset during the ide-probe at boot time. It is reported to support
+  DVD II drives, by the manufacturer.
 
-  Please read the comments at the top of drivers/block/pdc202xx.c
+HPT34X DMA support (DANGEROUS)
+CONFIG_BLK_DEV_HPT34X_DMA
+  you need to say Y to "Use DMA by default when available" if you say
+  Y here.
 
-  If unsure, say N.
+  Please read the comments at the top of drivers/block/hpt343.c
 
-Special Mode Feature (DANGEROUS)
-PDC202XX_FORCE_MASTER_MODE
-  For PDC20246 and PDC20262 Ultra DMA chipsets.
-  This is reserved for possible Hardware RAID 0,1 for the FastTrak Series.
+QDI QD6580 support
+CONFIG_BLK_DEV_QD6580
+  This driver is enabled at runtime using the "ide0=qd6580" kernel
+  boot parameter. It permits faster I/O speeds to be set. See the
+  files Documentation/ide.txt and drivers/block/qd6580.c for more
+  info.
 
-  Say N. 
+UMC 8672 support
+CONFIG_BLK_DEV_UMC8672
+  This driver is enabled at runtime using the "ide0=umc8672" kernel
+  boot parameter. It enables support for the secondary IDE interface
+  of the UMC-8672, and permits faster I/O speeds to be set as well.
+  See the files Documentation/ide.txt and drivers/block/umc8672.c for
+  more info.
 
-SiS5513 chipset support
-CONFIG_BLK_DEV_SIS5513
-  This driver ensures (U)DMA support for SIS5513 chipset based mainboards.
-  SiS620/530 UDMA mode 4, SiS5600/5597 UDMA mode 2, all other DMA mode 2
-  limited chipsets are unsupported to date.
+ALI M14xx support
+CONFIG_BLK_DEV_ALI14XX
+  This driver is enabled at runtime using the "ide0=ali14xx" kernel
+  boot parameter. It enables support for the secondary IDE interface
+  of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster
+  I/O speeds to be set as well. See the files Documentation/ide.txt
+  and drivers/block/ali14xx.c for more info.
 
-  This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
+Amiga builtin Gayle IDE interface support
+CONFIG_BLK_DEV_GAYLE
+  This is the IDE driver for the builtin IDE interface on some Amiga
+  models. It supports both the `A1200 style' (used in A600 and A1200)
+  and `A4000 style' (used in A4000 and A4000T) of the Gayle IDE
+  interface. Say Y if you have such an Amiga model and want to use IDE
+  devices (hard disks, CD-ROM drives, etc.) that are connected to the
+  builtin IDE interface.
 
-  Please read the comments at the top of drivers/block/sis5513.c
+Falcon IDE interface support
+CONFIG_BLK_DEV_FALCON_IDE
+  This is the IDE driver for the builtin IDE interface on the Atari
+  Falcon. Say Y if you have a Falcon and want to use IDE devices (hard
+  disks, CD-ROM drives, etc.) that are connected to the builtin IDE
+  interface.
 
-Winbond SL82c105 support
-CONFIG_BLK_DEV_SL82C105
-  If you have a Winbond SL82c105 IDE controller, say Y here to enable
-  special configuration for this chip. This is common on various CHRP
-  motherboards, but could be used elsewhere. If in doubt, say Y.
+Amiga Buddha/Catweasel IDE interface support (EXPERIMENTAL)
+CONFIG_BLK_DEV_BUDDHA
+  This is the IDE driver for the IDE interfaces on the Buddha and
+  Catweasel expansion boards.  It supports up to two interfaces on the
+  Buddha and three on the Catweasel.
 
-Tekram TRM290 chipset support (EXPERIMENTAL)
-CONFIG_BLK_DEV_TRM290
-  This driver adds support for bus master DMA transfers
-  using the Tekram TRM290 PCI IDE chip. Volunteers are
-  needed for further tweaking and development.
-  Please read the comments at the top of drivers/block/trm290.c.
+  Say Y if you have a Buddha or Catweasel expansion board and want to
+  use IDE devices (hard disks, CD-ROM drives, etc.) that are connected
+  to one of its IDE interfaces.
 
-VIA82C586 chipset support (EXPERIMENTAL)
-CONFIG_BLK_DEV_VIA82C586
-  This allows you to to configure your chipset for a better use while
-  running (U)DMA: it will allow you to enable efficiently the second
-  channel dma usage, as it is may not be set by BIOS. It allows you to
-  run a kernel command line at boot time in order to set fifo config.
-  If no command line is provided, it will try to set fifo configuration
-  at its best. It will allow you to get a proc/ide/via display
-  (while running a "cat") provided you enabled "proc" support and
-  set DISPLAY_APOLLO_TIMINGS in via82c586.c
+Amiga IDE Doubler support (EXPERIMENTAL)
+CONFIG_BLK_DEV_IDEDOUBLER
+  This driver provides support for the so called `IDE doublers' (made
+  by various manufacturers, e.g. Eyetech) that can be connected to the
+  builtin IDE interface of some Amiga models. Using such an IDE
+  doubler, you can connect up to four instead of two IDE devices on
+  the Amiga's builtin IDE interface.
 
-  This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
+  Note that the normal Amiga Gayle IDE driver may not work correctly
+  if you have an IDE doubler and don't enable this driver!
 
-  If unsure, say N.
+  Say Y if you have an IDE doubler.  The driver is enabled at kernel
+  runtime using the "ide=doubler" kernel boot parameter.
 
 Support for PowerMac IDE devices (must also enable IDE)
 CONFIG_BLK_DEV_IDE_PMAC
@@ -781,6 +914,17 @@ Use DMA by default
 CONFIG_IDEDMA_PMAC_AUTO
   No help for CONFIG_IDEDMA_PMAC_AUTO
 
+Macintosh Quadra/Powerbook IDE interface support
+CONFIG_BLK_DEV_MAC_IDE
+  This is the IDE driver for the builtin IDE interface on some m68k
+  Macintosh models. It supports both the `Quadra style' (used in
+  Quadra/ Centris 630 and Performa 588 models) and `Powerbook style'
+  (used in the Powerbook 150 and 190 models) IDE interface.
+
+  Say Y if you have such an Macintosh model and want to use IDE
+  devices (hard disks, CD-ROM drives, etc.) that are connected to the
+  builtin IDE interface.
+
 ICS IDE interface support
 CONFIG_BLK_DEV_IDE_ICSIDE
   No help for CONFIG_BLK_DEV_IDE_ICSIDE
@@ -797,133 +941,6 @@ RapIDE interface support
 CONFIG_BLK_DEV_IDE_RAPIDE
   No help for CONFIG_BLK_DEV_IDE_RAPIDE
 
-Other IDE chipset support
-CONFIG_IDE_CHIPSETS
-  Say Y here if you want to include enhanced support for various IDE
-  interface chipsets used on motherboards and add-on cards. You can
-  then pick your particular IDE chip from among the following options.
-  This enhanced support may be necessary for Linux to be able to
-  access the 3rd/4th drives in some systems. It may also enable
-  setting of higher speed I/O rates to improve system performance with
-  these chipsets. Most of these also require special kernel boot
-  parameters to actually turn on the support at runtime; you can find
-  a list of these in the file Documentation/ide.txt.
-  
-  People with SCSI-only systems can say N here. 
-
-Generic 4 drives/port support
-CONFIG_BLK_DEV_4DRIVES
-  Certain older chipsets, including the Tekram 690CD, use a single set
-  of I/O ports at 0x1f0 to control up to four drives, instead of the
-  customary two drives per port. Support for this can be enabled at
-  runtime using the "ide0=four" kernel boot parameter if you say Y
-  here.
-
-ALI M14xx support
-CONFIG_BLK_DEV_ALI14XX
-  This driver is enabled at runtime using the "ide0=ali14xx" kernel
-  boot parameter. It enables support for the secondary IDE interface
-  of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster
-  I/O speeds to be set as well. See the files Documentation/ide.txt
-  and drivers/block/ali14xx.c for more info.
-
-DTC-2278 support
-CONFIG_BLK_DEV_DTC2278
-  This driver is enabled at runtime using the "ide0=dtc2278" kernel
-  boot parameter. It enables support for the secondary IDE interface
-  of the DTC-2278 card, and permits faster I/O speeds to be set as
-  well. See the Documentation/ide.txt and drivers/block/dtc2278.c
-  files for more info.
-
-Holtek HT6560B support
-CONFIG_BLK_DEV_HT6560B
-  This driver is enabled at runtime using the "ide0=ht6560b" kernel
-  boot parameter. It enables support for the secondary IDE interface
-  of the Holtek card, and permits faster I/O speeds to be set as well.
-  See the Documentation/ide.txt and drivers/block/ht6560b.c files for
-  more info.
-
-PROMISE DC4030 support (EXPERIMENTAL)
-CONFIG_BLK_DEV_PDC4030
-  This driver provides support for the secondary IDE interface and
-  cache of Promise IDE chipsets, e.g. DC4030 and DC5030. This driver
-  is known to incur timeouts/retries during heavy I/O to drives
-  attached to the secondary interface. CDROM and TAPE devices are not
-  supported yet. This driver is enabled at runtime using the
-  "ide0=dc4030" kernel boot parameter. See the Documentation/ide.txt
-  and drivers/block/pdc4030.c files for more info.
-
-QDI QD6580 support
-CONFIG_BLK_DEV_QD6580
-  This driver is enabled at runtime using the "ide0=qd6580" kernel
-  boot parameter. It permits faster I/O speeds to be set. See the
-  files Documentation/ide.txt and drivers/block/qd6580.c for more
-  info.
-
-UMC 8672 support
-CONFIG_BLK_DEV_UMC8672
-  This driver is enabled at runtime using the "ide0=umc8672" kernel
-  boot parameter. It enables support for the secondary IDE interface
-  of the UMC-8672, and permits faster I/O speeds to be set as well.
-  See the files Documentation/ide.txt and drivers/block/umc8672.c for
-  more info.
-
-Amiga builtin Gayle IDE interface support
-CONFIG_BLK_DEV_GAYLE
-  This is the IDE driver for the builtin IDE interface on some Amiga
-  models.  It supports both the `A1200 style' (used in A600 and A1200)
-  and `A4000 style' (used in A4000 and A4000T) of the Gayle IDE interface.
-  Say Y if you have such an Amiga model and want to use IDE devices
-  (hard disks, CD-ROM drives, etc.) that are connected to the builtin
-  IDE interface.
-
-Amiga IDE Doubler support (EXPERIMENTAL)
-CONFIG_BLK_DEV_IDEDOUBLER
-  This driver provides support for the so called `IDE doublers' (made by
-  various manufacturers, e.g. Eyetech) that can be connected to the
-  builtin IDE interface of some Amiga models. Using such an IDE doubler,
-  you can connect up to four instead of two IDE devices on the Amiga's
-  builtin IDE interface.
-  Note that the normal Amiga Gayle IDE driver may not work correctly if
-  you have an IDE doubler and don't enable this driver!
-  Say Y if you have an IDE doubler.  The driver is enabled at kernel
-  runtime using the "ide=doubler" kernel boot parameter.
-
-Amiga Buddha/Catweasel IDE interface support (EXPERIMENTAL)
-CONFIG_BLK_DEV_BUDDHA
-  This is the IDE driver for the IDE interfaces on the Buddha and
-  Catweasel expansion boards.  It supports up to two interfaces on the
-  Buddha and three on the Catweasel.
-  Say Y if you have a Buddha or Catweasel expansion board and want to
-  use IDE devices (hard disks, CD-ROM drives, etc.) that are connected
-  to one of its IDE interfaces.
-
-Falcon IDE interface support
-CONFIG_BLK_DEV_FALCON_IDE
-  This is the IDE driver for the builtin IDE interface on the Atari Falcon.
-  Say Y if you have a Falcon and want to use IDE devices (hard disks,
-  CD-ROM drives, etc.) that are connected to the builtin IDE interface.
-
-Macintosh Quadra/Powerbook IDE interface support
-CONFIG_BLK_DEV_MAC_IDE
-  This is the IDE driver for the builtin IDE interface on the some m68k
-  Macintosh models. It supports both the `Quadra style' (used in Quadra/
-  Centris 630 and Performa 588 models) and `Powerbook style' (used in the
-  Powerbook 150 and 190 models) IDE interface.
-  Say Y if you have such an Macintosh model and want to use IDE devices
-  (hard disks, CD-ROM drives, etc.) that are connected to the builtin
-  IDE interface.
-
-PS/2 ESDI hard disk support
-CONFIG_BLK_DEV_PS2
-  Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
-  hard disk.
-  
-  If you want to compile the driver as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called ps2esdi.o.
-
 XT hard disk support
 CONFIG_BLK_DEV_XD
   Very old 8 bit hard disk controllers used in the IBM XT computer
@@ -939,8 +956,9 @@ CONFIG_BLK_DEV_XD
 Mylex DAC960/DAC1100 PCI RAID Controller support
 CONFIG_BLK_DEV_DAC960
   This driver adds support for the Mylex DAC960, AcceleRAID, and
-  eXtremeRAID PCI RAID controllers.  See README.DAC960 for further
-  information about this driver.
+  eXtremeRAID PCI RAID controllers. See the file
+  Documentation/README.DAC960 for further information about this
+  driver.
 
   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),
@@ -1198,8 +1216,8 @@ CONFIG_BLK_DEV_MD
   have such a controller, you do not need to say Y here.
 
   More information about Software RAID on Linux is contained in the
-  Software-RAID mini-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini. There you will also
+  Software-RAID mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
   learn where to get the supporting user space utilities raidtools.
 
   If unsure, say N.
@@ -1226,8 +1244,8 @@ CONFIG_MD_STRIPED
   the throughput rate if the partitions reside on distinct disks. 
 
   Information about Software RAID on Linux is contained in the
-  Software-RAID mini-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini. There you will also
+  Software-RAID mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
   learn where to get the supporting user space utilities raidtools.
 
   If you want to compile this as a module ( = code which can be
@@ -1248,8 +1266,8 @@ CONFIG_MD_MIRRORING
   drives. 
 
   Information about Software RAID on Linux is contained in the
-  Software-RAID mini-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini. There you will also
+  Software-RAID mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
   learn where to get the supporting user space utilities raidtools.
 
   If you want to use such a RAID-1 set, say Y. This code is also
@@ -1271,8 +1289,8 @@ CONFIG_MD_RAID5
   of the available parity distribution methods.
 
   Information about Software RAID on Linux is contained in the
-  Software-RAID mini-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini. There you will also
+  Software-RAID mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
   learn where to get the supporting user space utilities raidtools.
 
   If you want to use such a RAID-4/RAID-5 set, say Y. This code is
@@ -1294,17 +1312,14 @@ CONFIG_DESKSTATION_RPC44
   This is a machine with a R4400 100 MHz CPU. To compile a Linux
   kernel that runs on these, say Y here. For details about Linux
   on the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  http://www.linux.sgi.comm/ (To browse the WWW, you need to
-  have access to a machine on the Internet that has a program like
-  lynx or netscape).
+  http://www.linux.sgi.com/.
 
 Support for Acer PICA 1 chipset
 CONFIG_ACER_PICA_61
   This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
   kernel that runs on these, say Y here. For details about Linux on
   the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  http://www.linux.sgi.comm/ (To browse the WWW, you need to have access to
-  a machine on the Internet that has a program like lynx or netscape).
+  http://www.linux.sgi.com/.
 
 Support for Algorithmics P4032
 CONFIG_ALGOR_P4032
@@ -1336,12 +1351,12 @@ CONFIG_DECSTATION
 
 IDE card support
 CONFIG_BLK_DEV_IDE_CARDS
-  On Acorn systems, enable this if you wish to use an IDE interface
+  On Acorn systems, say Y here if you wish to use an IDE interface
   expansion card. If you do not or are unsure, say N to this.
 
 ICS IDE interface
 CONFIG_BLK_DEV_IDE_ICS
-  On Acorn systems, enable this if you wish to use the ICS IDE
+  On Acorn systems, say Y here if you wish to use the ICS IDE
   interface card.  This is not required for ICS partition support.
   If you are unsure, say N to this.
 
@@ -1396,6 +1411,15 @@ Compile the kernel into the ECOFF object format
 CONFIG_ECOFF_KERNEL
   Oops. How di I get here?
 
+Support for large 64-bit configurations
+CONFIG_MIPS_INSANE_LARGE
+  MIPS R10000 does support a 44 bit / 16TB address space as opposed to
+  previous 64-bit processors which only did only support 40 bit / 1TB.  If
+  you need processes of more than 1TB virtual address space activate this.
+  Activating CONFIG_MIPS_INSANE_LARGE results in additional memory usage,
+  so only activate this if you really need.  Very few people will need
+  this.
+
 Generate little endian code
 CONFIG_CPU_LITTLE_ENDIAN
   Some MIPS machines can be configured for either little or big endian
@@ -1419,8 +1443,8 @@ CONFIG_NET
   of which are given in Documentation/Changes.
 
   For a general introduction to Linux networking, it is highly
-  recommended to read the NET-3-HOWTO, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  recommended to read the NET-3-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
 Socket filtering
 CONFIG_FILTER
@@ -1434,22 +1458,55 @@ CONFIG_FILTER
 
 Network packet filtering
 CONFIG_NETFILTER
-  Netfilter is a framework for filtering and mangling packets.
+  Netfilter is a framework for filtering and mangling network packets
+  that pass through your Linux box.
+
+  The most common use of packet filtering is to run your Linux box as
+  a firewall protecting a local network from the Internet. The type of
+  firewall provided by this kernel support is called a "packet
+  filter", which means that it can reject individual network packets
+  based on type, source, destination etc. The other kind of firewall,
+  a "proxy-based" one, is more secure but more intrusive and more
+  bothersome to set up; it inspects the network traffic much more
+  closely, modifies it and has knowledge about the higher level
+  protocols, which a packet filter lacks. Moreover, proxy-based
+  firewalls often require changes to the programs running on the local
+  clients. 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.
+
+  You should also say Y here if you intend to use your Linux box as
+  the gateway to the Internet for a local network of machines without
+  globally valid IP addresses. This is called "masquerading": if one
+  of the computers on your local network wants to send something to
+  the outside, your box can "masquerade" as that computer, i.e. it
+  forwards the traffic to the intended outside destination, but
+  modifies the packets to make it look like they came from the
+  firewall box itself. It works both ways: if the outside host
+  replies, the Linux box will silently forward the traffic to the
+  correct local computer. This way, the computers on your local net
+  are completely invisible to the outside world, even though they can
+  reach the outside and can receive replies. It is even possible to
+  run globally visible servers from within a masqueraded local network
+  using a mechanism called portforwarding. Masquerading is also often
+  called NAT (Network Address Translation).
+
+  Another use of Netfilter is in transparent proxying: if a machine on
+  the local network tries to connect to an outside host, your Linux
+  box can transparently forward the traffic to a local server,
+  typically a caching proxy server.
+
   Various modules exist for netfilter which replace the previous
   masquerading (ipmasqadm), packet filtering (ipchains), transparent
-  proxying, and portforwarding mechanisms.  Enabling this option
-  makes minor alterations to allow these modules to hook into the
-  packet stream.  More information is available from 
-  http://netfilter.kernelnotes.org (to browse the WWW, you need
-  to have access to a machine on the Internet that has a program like
-  lynx or netscape).
-
+  proxying, and portforwarding mechanisms. More information is
+  available from http://netfilter.kernelnotes.org .
+ 
   Make sure to say N to "Fast switching" below if you intend to say Y
   here, as Fast switching currently bypasses netfilter.
-
-  Chances are that you should say Y here for every machine which is
-  run as a router and N for every regular host. If unsure, say N.
-
+ 
+  Chances are that you should say Y here if you compile a kernel which
+  will run as a router and N for regular hosts. If unsure, say N.
+ 
 Network packet filtering debugging
 CONFIG_NETFILTER_DEBUG
   Say Y to make sure packets aren't leaking.
@@ -1469,7 +1526,7 @@ CONFIG_SYN_COOKIES
   is no need for the legitimate users to change their TCP/IP software;
   SYN cookies work transparently to them. For technical information
   about SYN cookies, check out
-  ftp://koobera.math.uic.edu/pub/docs/syncookies-archive.
+  ftp://koobera.math.uic.edu/pub/docs/syncookies-archive .
 
   If you are SYN flooded, the source address reported by the kernel is
   likely to have been forged by the attacker; it is only reported as
@@ -1503,9 +1560,7 @@ CONFIG_ALPHA_GENERIC
 
   To find out what type of Alpha system you have, you may want to
   check out the Linux/Alpha FAQ, accessible on the WWW from
-  http://www.alphalinux.org (To browse the WWW, you need to
-  have access to a machine on the Internet that has a program like
-  lynx or netscape).  In summary:
+  http://www.alphalinux.org . In summary:
 
   Alcor/Alpha-XLT     AS 600
   Alpha-XL            XL-233, XL-266
@@ -1548,9 +1603,7 @@ CONFIG_ALPHA_SRM
   which is command line driven, and ARC, which uses menus and arrow
   keys. Details about the Linux/Alpha booting process are contained in
   the Linux/Alpha FAQ, accessible on the WWW from
-  http://www.alphalinux.org (To browse the WWW, you need to
-  have access to a machine on the Internet that has a program like
-  lynx or netscape).
+  http://www.alphalinux.org .
 
   The usual way to load Linux on an Alpha machine is to use MILO
   (a bootloader that lets you pass command line parameters to the
@@ -1602,8 +1655,7 @@ CONFIG_SERIAL_MANY_PORTS
   Say Y here if you have dumb serial boards other than the four
   standard COM 1/2/3/4 ports. This may happen if you have an AST
   FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
-  via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini), or other custom
+  from http://metalab.unc.edu/mdw/linux.html#howto ), 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. You can also say Y if you have an
@@ -1684,8 +1736,8 @@ CONFIG_PCI
   your box. Other bus systems are ISA, EISA, Microchannel (MCA) or
   VESA. If you have PCI, say Y, otherwise N. 
 
-  The PCI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO, contains valuable
+  The PCI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , contains valuable
   information about which PCI hardware does work under Linux and which
   doesn't.
 
@@ -1725,58 +1777,139 @@ CONFIG_FB_SGIVW
 
 I2O support
 CONFIG_I2O
-  The Intelligent Input/Output (I2O) architecture allows
-  hardware drivers to be split into two parts: an operating system
-  specific module called the OSM and an hardware specific module
-  called the HDM. The OSM can talk to a whole range of HDM's, and
-  ideally the HDM's are not OS dependent. This allows for the same
-  driver to be used under different operating systems if the relevant
-  OSM is in place. If you say Y here, you will get a choice of OSM's
-  with the following questions.
+  The Intelligent Input/Output (I2O) architecture allows hardware
+  drivers to be split into two parts: an operating system specific
+  module called the OSM and an hardware specific module called the
+  HDM. The OSM can talk to a whole range of HDM's, and ideally the
+  HDM's are not OS dependent. This allows for the same HDM driver to
+  be used under different operating systems if the relevant OSM is in
+  place. In order for this to work, you need to have an I2O interface
+  adapter card in your computer. This card contains a special I/O
+  processor (IOP), thus allowing high speeds since the CPU does not
+  have to deal with I/O.
+
+  If you say Y here, you will get a choice of interface adapter
+  drivers and OSM's with the following questions.
 
   This support is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   If you want to compile it as a module, say M here and read
-  Documentation/modules.txt.
+  Documentation/modules.txt. You will get modules called i2o_core.o
+  and i20_config.o. 
 
   If unsure, say N.
 
 I2O PCI support
 CONFIG_I2O_PCI
-  Build in support for PCI bus I2O interface adapters. Currently this
-  is the only variety supported.
+  Say Y for support of PCI bus I2O interface adapters. Currently this
+  is the only variety supported, so you should say Y.
+
+  This support is also available as a module called i2o_pci.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.
 
 I2O Block OSM
 CONFIG_I2O_BLOCK
-  Include support for the I2O Block OSM. The Block OSM presents disk and
-  other structured block devices to the operating system.
+  Include support for the I2O Block OSM. The Block OSM presents disk
+  and other structured block devices to the operating system.
+
+  This support is also available as a module called i2o_block.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.
 
 I2O LAN OSM
 CONFIG_I2O_LAN
-  Include support for the LAN OSM. You will also need to include support
-  for token ring or fddi if you wish to use token ring or FDDI I2O cards
-  with this driver.
+  Include support for the LAN OSM. You will also need to include
+  support for token ring or FDDI if you wish to use token ring or FDDI
+  I2O cards with this driver.
+
+  This support is also available as a module called i2o_lan.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.
 
 I2O SCSI OSM
 CONFIG_I2O_SCSI
-  Allow direct scsi access to scsi devices on a SCSI or FibreChannel I2O 
-  controller. You can use both the SCSI and Block OSM together if you wish.
+  Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
+  I2O controller. You can use both the SCSI and Block OSM together if
+  you wish.
+
+  This support is also available as a module called i2o_scsi.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.
+
+I2O /proc support
+CONFIG_I2O_PROC
+  If you say Y here and to "/proc filesystem support", you will be
+  able to read I2O related information from the virtual directory
+  /proc/i2o.
+
+  This support is also available as a module called i2o_proc.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.
+
+Plug and Play support
+CONFIG_PNP
+  Plug and Play (PnP) is a standard for peripherals which allows those
+  peripherals to be configured by software, e.g. assign IRQ's or other
+  parameters. No jumpers on the cards are needed, instead the values
+  are provided to the cards from the BIOS, from the operating system,
+  or using a user-space utility.
+
+  Say Y here if you would like Linux to configure your Plug and Play
+  devices. You should then also say Y to "ISA Plug and Play support",
+  below. Alternatively, you can configure your PnP devices using the
+  user space utilities contained in the isapnptools package.
+  
+  This support is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  If you want to compile it as a module, say M here and read
+  Documentation/modules.txt.
+
+ISA Plug and Play support
+CONFIG_ISAPNP
+  Say Y here if you would like support for ISA Plug and Play devices.
+  
+  This support is also available as a module called isapnp.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+  If unsure, say Y.
+
+PCMCIA/Cardbus support
+CONFIG_PCMCIA
+  Say Y here if you want to attach PCMCIA's (PC-cards) to your Linux
+  computer. These are credit-card size devices such as network cards,
+  modems or hard drives popular with laptops.
+
+  You will also need David Hinds' pcmcia-cs package (see the file
+  Documentation/Changes for location).
+
+CardBus support
+CONFIG_CARDBUS
+  CardBus is a bus mastering architecture for PC-cards (it allows
+  PC-cards to talk to the rest of the stuff inside your computer). If
+  unsure, say Y.
 
 System V IPC
 CONFIG_SYSVIPC
   Inter Process Communication is a suite of library functions and
-  system calls which let processes (running programs) synchronize
-  and exchange information. It is generally considered to be a good
-  thing, and some programs won't run unless you say Y here. In
-  particular, if you want to run the DOS emulator dosemu under Linux
-  (read the DOSEMU-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO), you'll need to say Y
+  system calls which let processes (running programs) synchronize and
+  exchange information. It is generally considered to be a good thing,
+  and some programs won't run unless you say Y here. In particular, if
+  you want to run the DOS emulator dosemu under Linux (read the
+  DOSEMU-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto ), you'll need to say Y
   here.
   
   You can find documentation about IPC with "info ipc" and also in
-  section 6.4 of the Linux Programmer's Guide, available via FTP
-  (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/LDP/programmers-guide.
+  section 6.4 of the Linux Programmer's Guide, available from
+  http://metalab.unc.edu/mdw/linux.html#guide .
 
   Saying Y here enlarges your kernel by about 7 KB. Just say Y.
 
@@ -1797,11 +1930,11 @@ 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. They are explained in the files in
-  Documentation/sysctl/. Note that enabling this option will enlarge
-  the kernel by at least 8 KB. 
+  interface consists of a system call, but if you say Y to "/proc
+  filesystem support", 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 8 KB.
 
   As it is generally a good thing, you should say Y here unless
   building a kernel for install/rescue disks or your system is very
@@ -1820,8 +1953,8 @@ CONFIG_BINFMT_ELF
   executables are distributed solely in ELF format. You definitely
   want to say Y here.
 
-  Information about ELF is contained in the ELF HOWTO available via
-  FTP (user: anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  Information about ELF is contained in the ELF HOWTO available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you find that after upgrading from Linux kernel 1.2 and saying Y
   here, you still can't run any ELF binaries (they just crash), then
@@ -1861,6 +1994,10 @@ CONFIG_BINFMT_EM86
   Say Y here if you want to be able to execute Linux/Intel ELF
   binaries just like native Alpha binaries on your Alpha machine. For
   this to work, you need to have the emulator /usr/bin/em86 in place.
+
+  You can get the same functionality by saying N here and saying Y to
+  "Kernel support for MISC binaries". 
+
   You may answer M to compile the emulation support as a module and
   later load the module when you want to use a Linux/Intel binary. The
   module will be called binfmt_em86.o. If unsure, say Y.
@@ -1871,17 +2008,13 @@ CONFIG_BINFMT_MISC
   formats into the kernel. You will like this especially when you use
   programs that need an interpreter to run like Java, Python or
   Emacs-Lisp. It's also useful if you often run DOS executables under
-  the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO, available in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO). Once you have
+  the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto ). Once you have
   registered such a binary class with the kernel, you can start one of
   those programs simply by typing in its name at a shell prompt; Linux
   will automatically feed it to the correct interpreter.
 
-  If you say Y here, you won't need "Kernel support for JAVA binaries"
-  (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
+  You can do other nice things, too. Read the file
   Documentation/binfmt_misc.txt to learn how to use this feature, and
   Documentation/java.txt for information about how to include Java
   support.
@@ -1919,8 +2052,9 @@ CONFIG_M386
    - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
      486DLC/DLC2 and UMC 486SX-S. Only "386" kernels will run on a 386
      class machine.
-   - "486" for the AMD/Cyrix/IBM/Intel DX4 or 486DX/DX2/SL/SX/SX2,
-     AMD/Cyrix 5x86, NexGen Nx586 and UMC U5D or U5S.
+   - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
+     SL/SLC/SLC2/SLC3/SX/SX2, AMD/Cyrix 5x86, NexGen Nx586 and
+     UMC U5D or U5S.
    - "586" for generic Pentium CPUs, possibly lacking the TSC 
      (time stamp counter) register.
    - "Pentium" for the Intel Pentium/Pentium MMX, AMD K5, K6 and 
@@ -1937,8 +2071,8 @@ CONFIG_VGA_CONSOLE
   everyone wants that. 
 
   The program SVGATextMode can be used to utilize SVGA video cards to
-  their full potential in text mode. Download it via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/utils/console.
+  their full potential in text mode. Download it from
+  ftp://metalab.unc.edu/pub/Linux/utils/console .
 
   Say Y.
 
@@ -1949,13 +2083,14 @@ CONFIG_VIDEO_SELECT
   card's BIOS offers, but the traditional Linux utilities like
   SVGATextMode don't, you can say Y here and set the mode using the
   "vga=" option from your boot loader (lilo or loadlin) or set
-  "vga=ask" which brings up a video mode menu on kernel startup. Try
+  "vga=ask" which brings up a video mode menu on kernel startup. (Try
   "man bootparam" or see the documentation of your boot loader about
   how to pass options to the kernel. The lilo procedure is also
-  explained in the SCSI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Read
-  Documentation/svga.txt for more information about the Video mode
-  selection support. If unsure, say N.
+  explained in the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
+
+  Read the file Documentation/svga.txt for more information about the
+  Video mode selection support. If unsure, say N.
 
 Support for frame buffer devices (EXPERIMENTAL)
 CONFIG_FB
@@ -2049,15 +2184,23 @@ CONFIG_FB_RETINAZ3
   you have a Retina Z3 or plan to get one before you next recompile
   the kernel.
 
-Cirrus Logic generic driver (EXPERIMENTAL)
+Cirrus Logic support (EXPERIMENTAL)
 CONFIG_FB_CLGEN
   This enables support for Cirrus Logic GD542x/543x based boards on
   Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
-  If you have a PCI-based system, this enables support for these chips:
-  GD-543x, GD-544x, GD-5480.
+
+  If you have a PCI-based system, this enables support for these
+  chips: GD-543x, GD-544x, GD-5480.
+
+  Please read the file Documentation/fb/clgenfb.txt.
+
   Say N unless you have such a graphics board or plan to get one
   before you next recompile the kernel.
 
+Permedia2 support (EXPERIMENTAL)
+CONFIG_FB_PM2
+  Say Y here if this is your graphics board.
+
 Apollo support
 CONFIG_APOLLO
   Say Y here if you want to run Linux on an MC680x0-based Apollo
@@ -2087,7 +2230,13 @@ CONFIG_FB_S3TRIO
 ATI Mach64 display support
 CONFIG_FB_ATY
   This driver supports graphics boards with the ATI Mach64 chips.
+  Say Y if you have such a graphics board.
 
+  The driver is also available as a module ( = code which can be
+  inserted and removed from the running kernel whenever you want). The
+  module will be called atyfb.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+  
 PowerMac "control" frame buffer device support
 CONFIG_FB_CONTROL
   This driver supports a frame buffer for the graphics adapter in the
@@ -2135,6 +2284,11 @@ CONFIG_FB_VGA16
   This is the frame buffer device driver for VGA 16 color graphic
   cards. Say Y if you have such a card.
 
+  This code is also available as a module. If you want to compile 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 vga16fb.o.
+
 Backward compatibility mode for Xpmac
 CONFIG_FB_COMPAT_XPMAC
   If you use the Xpmac X server (common with mklinux), you'll need to
@@ -2177,7 +2331,7 @@ CONFIG_FB_MATROX_MYSTIQUE
   packed pixel and 32 bpp packed pixel. You can also use font widths
   different from 8.
 
-Matrox G100/G200 support
+Matrox G100/G200/G400 support
 CONFIG_FB_MATROX_G100
   Say Y here if you have a Matrox Productiva G100, Matrox Mystique
   G200, Matrox Marvel G200 or Matrox Millennium G200 video card. If
@@ -2350,10 +2504,17 @@ CONFIG_FBCON_MAC
   bits per pixel packed pixels on Mac. It supports variable font
   widths for low resolution screens.
   
+#VGA 16-color planar support
+#CONFIG_FBCON_VGA_PLANES
+###
+###What is this?
+###
+
 VGA characters/attributes support
 CONFIG_FBCON_VGA
   This is the low level frame buffer console driver for VGA text mode;
-  it is used by frame buffer device drivers that support VGA text mode.
+  it is used by frame buffer device drivers that support VGA text
+  mode.
 
 Parallel-port support
 CONFIG_PARPORT
@@ -2366,8 +2527,7 @@ CONFIG_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
-  Internet that has a program like lynx or netscape).
+  WWW.
 
   It is possible to share a single parallel port among several devices
   and it is safe to compile all the corresponding drivers into the
@@ -2405,6 +2565,11 @@ CONFIG_PARPORT_PC_FIFO
   FIFO. See Documentation/parport.txt to find out how to specify
   which IRQ/DMA to use.
 
+Support for PCMCIA management for PC-style ports
+CONFIG_PARPORT_PC_PCMCIA
+  Say Y here if you need PCMCIA support for your PC-style parallel
+  ports. If unsure, say N.
+
 Support foreign hardware
 CONFIG_PARPORT_OTHER
   Say Y here if you want to be able to load driver modules to support
@@ -2424,7 +2589,7 @@ CONFIG_PARPORT_1284
   such as EPP and ECP, say Y here to enable advanced IEEE 1284
   transfer modes. Also say Y if you want device ID information to
   appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
-
+ 
 Enable loadable module support
 CONFIG_MODULES
   Kernel modules are small pieces of compiled code which can be
@@ -2481,10 +2646,10 @@ CONFIG_ARPD
   daemon arpd. Arpd then answers the address resolution request either
   from its own cache or by asking the net.
 
-  This code is experimental. If you do say Y here, you should obtain a
-  copy of arpd from http://www.loran.com/~layes/arpd/index.html, and
-  you should also say Y to "Kernel/User network link driver", below.
-  If unsure, say N.
+  This code is experimental and also obsolete. If you want to use it,
+  you need to find a version of the daemon arpd on the net somewhere,
+  and you should also say Y to "Kernel/User network link driver",
+  below. If unsure, say N.
 
 TCP/IP networking
 CONFIG_INET
@@ -2496,14 +2661,14 @@ CONFIG_INET
   allows you to ping yourself (great fun, that!).
 
   For an excellent introduction to Linux networking, please read the
-  NET-3-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  NET-3-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This option is also necessary if you want to use the full power of
   term (term is a program which gives you almost full Internet
   connectivity if you have a regular dial up shell account on some
   Internet connected Unix computer; for more information, read
-  http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html).
+  http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html ).
   
   If you say Y here and also to "/proc filesystem support" and "Sysctl
   support" below, you can change various aspects of the behavior of
@@ -2520,9 +2685,7 @@ CONFIG_IP_MULTICAST
   intend to participate in the MBONE, a high bandwidth network on top
   of the Internet which carries audio and video broadcasts. More
   information about the MBONE is on the WWW at
-  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
-  program like lynx or netscape). Information about the multicast
+  http://www-itg.lbl.gov/mbone/ . Information about the multicast
   capabilities of the various network cards is contained in
   Documentation/networking/multicast.txt. For most people, it's safe
   to say N.
@@ -2577,7 +2740,7 @@ CONFIG_IP_MULTIPLE_TABLES
 
   If you are interested in this, please see the preliminary
   documentation at http://www.compendium.com.ar/policy-routing.txt and
-  ftp://post.tepkom.ru/pub/vol2/Linux/docs/advanced-routing.tex. You
+  ftp://post.tepkom.ru/pub/vol2/Linux/docs/advanced-routing.tex . You
   will need supporting software from ftp://ftp.inr.ac.ru/ip-routing/
   
   If unsure, say N.
@@ -2693,7 +2856,7 @@ CONFIG_NET_IPIP
   appear on a different network than it physically is, or to use
   mobile-IP facilities (allowing laptops to seamlessly move between
   networks without changing their IP addresses; check out
-  http://anchor.cs.binghamton.edu/~mobileip/LJ/index.html). 
+  http://anchor.cs.binghamton.edu/~mobileip/LJ/index.html ). 
 
   Saying Y to this option will produce two modules ( = code which can
   be inserted in and removed from the running kernel whenever you
@@ -2722,15 +2885,12 @@ 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 most
-  common case is that you want to serve different WWW or ftp documents
+  common case is that you want to serve different WWW or FTP documents
   to the outside depending on which of your host names was used to
   connect to you. This is called "multihosting" or "virtual 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-Services-HOWTO,
-  available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  or "virtual hosting services" and is explained in the
+  Virtual-Services-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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
@@ -2758,9 +2918,7 @@ CONFIG_IP_PIMSM_V1
   Multicast) version 1. This multicast routing protocol is used widely
   because Cisco supports it. You need special software to use it
   (pimd-v1). Please see http://netweb.usc.edu/pim/ for more
-  information about PIM (to browse the WWW, you need to have access to
-  a machine on the Internet that has a program like lynx or
-  netscape). 
+  information about PIM.
 
   Say Y if you want to use PIM-SM v1. Note that you can say N here if
   you just want to use Dense Mode PIM.
@@ -2782,38 +2940,6 @@ CONFIG_INET_PCTCP
   People having problems with NCSA telnet should see the file
   linux/Documentation/networking/ncsa-telnet.
 
-Reverse ARP server
-CONFIG_INET_RARP
-  If there are (usually diskless or portable) 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 procedure at boot time,
-  and diskless Linux boxes can be configured to do it as well.
-  
-  If you want your Linux box to be able to *answer* such requests,
-  answer Y here; you'll then have to run the program rarp ("man rarp")
-  on your box.
-
-  If you actually want to use a diskless Sun 3 machine as an X
-  terminal to Linux, say Y here and fetch Linux-Xkernel from
-  ftp://metalab.unc.edu/pub/Linux/system/network/boot.net/.
-
-  Superior solutions to the problem of booting and configuring
-  machines over a net connection are given by the protocol BOOTP and
-  its successor DHCP. See the DHCP FAQ
-  http://web.syr.edu/~jmwobus/comfaqs/dhcp.faq.html 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).
-
-  If you want to compile RARP 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 rarp.o. 
-
-  If you don't understand a word of the above, say N and rest in
-  peace.
-
 Assume subnets are local
 CONFIG_INET_SNARL
   Say Y if you are on a subnetted network with all machines connected
@@ -2887,15 +3013,14 @@ 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"). 
+  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 http://www.bieringer.de/linux/IPv6/ and 
-  the file net/ipv6/README in the kernel source. 
+  IPv6, see http://playground.sun.com/pub/ipng/html/ipng-main.html ;
+  for specific information about IPv6 under Linux read the HOWTO at
+  http://www.bieringer.de/linux/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. You will still be able to do regular
@@ -2936,10 +3061,10 @@ CONFIG_IPX
   This is support for the Novell networking protocol, IPX, commonly
   used for local networks of Windows machines. You need it if you want
   to access Novell NetWare file or print servers using the Linux
-  Novell client ncpfs (available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/system/filesystems/) or from within
-  the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO, available in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO). In order to do the
+  Novell client ncpfs (available from
+  ftp://metalab.unc.edu/pub/Linux/system/filesystems/ ) or from within
+  the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto ). In order to do the
   former, you'll also have to say Y to "NCP filesystem support",
   below.
 
@@ -2950,13 +3075,12 @@ CONFIG_IPX
   To turn your Linux box into a fully featured NetWare file server and
   IPX router, say Y here and fetch either lwared from
   ftp://metalab.unc.edu/pub/Linux/system/network/daemons/ or mars_nwe
-  from ftp://ftp.gwdg.de/pub/linux/misc/ncpfs. For more information,
-  read the IPX-HOWTO in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  from ftp://ftp.gwdg.de/pub/linux/misc/ncpfs . For more information,
+  read the IPX-HOWTO available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   General information about how to connect Linux, Windows machines and
-  Macs is on the WWW at http://www.eats.com/linux_mac_win.html (to
-  browse the WWW, you need to have access to a machine on the Internet
-  that has a program like lynx or netscape). 
+  Macs is on the WWW at http://www.eats.com/linux_mac_win.html .
 
   The IPX driver would enlarge your kernel by about 5 kB. This driver
   is also available as a module ( = code which can be inserted in and
@@ -2974,7 +3098,7 @@ CONFIG_IPX_INTERN
   same address). The way this is done is to create a virtual internal
   "network" inside your box and to assign an IPX address to this
   network. Say Y here if you want to do this; read the IPX-HOWTO at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO for details.
+  http://metalab.unc.edu/mdw/linux.html#howto for details.
 
   The full internal IPX network enables you to allocate sockets on
   different virtual nodes of the internal network. This is done by
@@ -2987,7 +3111,7 @@ CONFIG_IPX_INTERN
   'special' sockets to sockets listening on the primary network is
   disabled. This might break existing applications, especially RIP/SAP
   daemons. A RIP/SAP daemon that works well with the full internal net
-  can be found on ftp://ftp.gwdg.de/pub/linux/misc/ncpfs. 
+  can be found on ftp://ftp.gwdg.de/pub/linux/misc/ncpfs . 
 
   If you don't know what you are doing, say N.
 
@@ -3004,7 +3128,7 @@ CONFIG_SPX
   space programs lwared or mars_nwe for the server side).
 
   Say Y here if you have use for SPX; read the IPX-HOWTO at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO for details.
+  http://metalab.unc.edu/mdw/linux.html#howto for details.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -3025,9 +3149,13 @@ CONFIG_DECNET
   More detailed documentation is available in the
   Documentation/networking/decnet.txt file.
 
-  Be sure to turn on the CONFIG_PROCFS and CONFIG_SYSCTL options
-  when using DECnet, since you will need sysctl support to aid in
-  configuration at run time.
+  Be sure to say Y to "/proc filesystem support" and "Sysctl support"
+  below when using DECnet, since you will need sysctl support to aid
+  in configuration at run time.
+
+  The DECnet code 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 decnet.o.
 
 DECnet SIOCFIGCONF support
 CONFIG_DECNET_SIOCGIFCONF
@@ -3035,19 +3163,23 @@ CONFIG_DECNET_SIOCGIFCONF
    you know what you are doing. It can break other applications which
    use this system call and the proper way to get the information
    provided by this call is to use rtnetlink.
+   
+   If unsure, say N.
 
 DECnet Router Support
 CONFIG_DECNET_ROUTER
    Add support for turning your DECnet Endnode into a level 1 or 2
-   router. This is an unfinished option for developers only. If you
-   do turn it on, then make sure you also have rtnetlink configured
-   in, since thats the only current method of configuration.
+   router. This is an unfinished option for developers only. If you do
+   turn it on, then make sure that you also say Y to "Kernel/User
+   network link driver" and "Routing messages", since rtnetlink is the
+   only current method of configuration.
 
 DECnet Raw Socket Support
 CONFIG_DECNET_RAW
    Add support for the SOCK_RAW type under DECnet. Used by userland
    routing programs to receive routing messages from the kernel and
-   also as a general debugging aid to see whats going on "under the hood".
+   also as a general debugging aid to see what's going on "under the
+   hood".
 
 AppleTalk DDP
 CONFIG_ATALK
@@ -3057,16 +3189,15 @@ CONFIG_ATALK
   netatalk package so that your Linux box can act as a print and file
   server for Macs as well as access AppleTalk printers. Check out
   http://threepio.hitchcock.org/cgi-bin/faq/netatalk/faq.pl on the WWW
-  for details (to browse the WWW, you need to have access to a machine
-  on the Internet that has a program like lynx or netscape). EtherTalk
-  is the name used for AppleTalk over Ethernet and the cheaper and
-  slower LocalTalk is AppleTalk over a proprietary Apple network using
-  serial links. EtherTalk and LocalTalk are fully supported by Linux.
+  for details. 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.
 
   General information about how to connect Linux, Windows machines and
-  Macs is on the WWW at http://www.eats.com/linux_mac_win.html
-  The NET-3-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO contains valuable
+  Macs is on the WWW at http://www.eats.com/linux_mac_win.html The
+  NET-3-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , contains valuable
   information as well.
 
   This driver is also available as a module ( = code which can be
@@ -3153,10 +3284,8 @@ Amateur Radio support
 CONFIG_HAMRADIO
   If you want to connect your Linux box to an amateur radio, answer Y
   here. You want to read http://www.tapr.org/tapr/html/pkthome.html
-  (to browse the WWW, you need to have access to a machine on the
-  Internet that has a program like lynx or netscape) and the HAM-HOWTO
-  and the AX25-HOWTO, both available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  and the HAM-HOWTO and the AX25-HOWTO, both available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -3179,13 +3308,11 @@ CONFIG_AX25
 
   Information about where to get supporting software for Linux amateur
   radio as well as information about how to configure an AX.25 port is
-  contained in the AX25-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. You might also want to
+  contained in the AX25-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . You might also want to
   check out the file Documentation/networking/ax25.txt in the kernel
   source. More information about digital amateur radio in general is
-  on the WWW at http://www.tapr.org/tapr/html/pkthome.html. (To browse
-  the WWW, you need to have access to a machine on the Internet that
-  has a program like lynx or netscape).
+  on the WWW at http://www.tapr.org/tapr/html/pkthome.html .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -3217,13 +3344,11 @@ CONFIG_NETROM
 
   A comprehensive listing of all the software for Linux amateur radio
   users as well as information about how to configure an AX.25 port is
-  contained in the AX25-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. You also might want to
+  contained in the AX25-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . You also might want to
   check out the file Documentation/networking/ax25.txt. More
   information about digital amateur radio in general is on the WWW at
-  http://www.tapr.org/tapr/html/pkthome.html (to browse the WWW, you
-  need to have access to a machine on the Internet that has a program
-  like lynx or netscape).
+  http://www.tapr.org/tapr/html/pkthome.html .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -3238,13 +3363,11 @@ CONFIG_ROSE
 
   A comprehensive listing of all the software for Linux amateur radio
   users as well as information about how to configure an AX.25 port is
-  contained in the AX25-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. You also might want to
+  contained in the AX25-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . You also might want to
   check out the file Documentation/networking/ax25.txt. More
   information about digital amateur radio in general is on the WWW at
-  http://www.tapr.org/tapr/html/pkthome.html (to browse the WWW, you
-  need to have access to a machine on the Internet that has a program
-  like lynx or netscape).
+  http://www.tapr.org/tapr/html/pkthome.html .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -3303,11 +3426,11 @@ CONFIG_DMASCC
   traffic.
 
   Currently, this driver supports Ottawa PI/PI2
-  (http://hydra.carleton.ca/info/pi2.html) and Gracilis PackeTwin
-  (http://www.paccomm.com/gracilis.html) boards. They are detected
+  (http://hydra.carleton.ca/info/pi2.html ) and Gracilis PackeTwin
+  (http://www.paccomm.com/gracilis.html ) boards. They are detected
   automatically. If you have one of these cards, say Y here and read
-  the AX25-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/.
+  the AX25-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver can operate multiple boards simultaneously. If you
   compile it as a module (by saying M instead of Y), it will be called
@@ -3323,18 +3446,15 @@ CONFIG_DMASCC
   certain parameters, such as channel access timing, clock mode, and
   DMA channel. This is accomplished with a small utility program,
   dmascc_cfg, available at
-  http://www.nt.tuwien.ac.at/~kkudielk/Linux/. (To browse the WWW, you
-  need to have access to a machine on the Internet that has a program
-  like lynx or netscape).
+  http://www.nt.tuwien.ac.at/~kkudielk/Linux/ .
 
 Z8530 SCC driver for AX.25
 CONFIG_SCC
   These cards are used to connect your Linux box to an amateur radio
   in order to communicate with other computers. If you want to use
-  this, read Documentation/networking/z8530drv.txt and the
-  AX25-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Also make sure to say Y
-  to "Amateur Radio AX.25 Level 2" support.
+  this, read Documentation/networking/z8530drv.txt and the AX25-HOWTO,
+  available from http://metalab.unc.edu/mdw/linux.html#howto . Also
+  make sure to say Y to "Amateur Radio AX.25 Level 2" support.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -3353,12 +3473,16 @@ CONFIG_SCC_DELAY
 ### Don't know what's going on here.
 ###
 #
+
 YAM driver for AX.25
 CONFIG_YAM
-  Support for the YAM modem on serial port. If you want to compile this
-  as a module ( = code which can be inserted in and removed from the
-  running kernel whenever you want), say M here and read
-  Documentation/modules.txt.
+  The YAM is a modem for packet radio which connects to the serial
+  port and includes some of the functions of a Terminal Node
+  Controller. If you have one of those, say Y here.
+
+  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.
 
 BAYCOM picpar and par96 driver for AX.25
 CONFIG_BAYCOM_PAR
@@ -3366,9 +3490,8 @@ CONFIG_BAYCOM_PAR
   connect to a parallel interface. The driver supports the picpar and
   par96 designs. To configure the driver, use the sethdlc utility
   available in the standard ax25 utilities package. For information on
-  the modems, see http://www.baycom.de (to browse the WWW, you need to
-  have access to a machine on the Internet that has a program like
-  lynx or netscape) and Documentation/networking/baycom.txt. 
+  the modems, see http://www.baycom.de and the file
+  Documentation/networking/baycom.txt.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -3381,9 +3504,8 @@ CONFIG_BAYCOM_EPP
   connect to a parallel interface. The driver supports the EPP
   designs. To configure the driver, use the sethdlc utility available
   in the standard ax25 utilities package. For information on the
-  modems, see http://www.baycom.de (to browse the WWW, you need to
-  have access to a machine on the Internet that has a program like
-  lynx or netscape) and Documentation/networking/baycom.txt.
+  modems, see http://www.baycom.de and the file
+  Documentation/networking/baycom.txt.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -3401,10 +3523,8 @@ CONFIG_BAYCOM_SER_FDX
   driver and still provided in case this driver does not work with
   your serial interface chip. To configure the driver, use the sethdlc
   utility available in the standard ax25 utilities package. For
-  information on the modems, see http://www.baycom.de (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape) and
-  Documentation/networking/baycom.txt. 
+  information on the modems, see http://www.baycom.de and
+  Documentation/networking/baycom.txt.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -3417,12 +3537,10 @@ CONFIG_BAYCOM_SER_HDX
   modems that connect to a serial interface. The driver supports the
   ser12 design in full duplex mode. This is the old driver. It is
   still provided in case your serial interface chip does not work with
-  the full duplex driver. This driver is depreciated. To configure
-  the driver, use the sethdlc utility available in the standard ax25
+  the full duplex driver. This driver is depreciated. To configure the
+  driver, use the sethdlc utility available in the standard ax25
   utilities package. For information on the modems, see
-  http://www.baycom.de (to browse the WWW, you need to have access to
-  a machine on the Internet that has a program like lynx or netscape)
-  and Documentation/networking/baycom.txt. 
+  http://www.baycom.de and Documentation/networking/baycom.txt.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -3439,10 +3557,8 @@ CONFIG_SOUNDMODEM
   To configure the driver, use the sethdlc, smdiag and smmixer
   utilities available in the standard ax25 utilities package. For
   information on how to key the transmitter, see
-  http://www.ife.ee.ethz.ch/~sailer/pcf/ptt_circ/ptt.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
-  Documentation/networking/soundmodem.txt. 
+  http://www.ife.ee.ethz.ch/~sailer/pcf/ptt_circ/ptt.html and
+  Documentation/networking/soundmodem.txt.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -3538,13 +3654,11 @@ CONFIG_X25
   if you want that) and the lower level data link layer protocol LAPB
   (say Y to "LAPB Data Link Driver" below if you want that). 
 
-  You can read more about X.25 at http://www.sangoma.com/x25.html and
-  http://www.cisco.com/univercd/data/doc/software/11_0/rpcg/cx25.htm
-  (to browse the WWW, you need to have access to a machine on the
-  Internet that has a program like lynx or netscape). Information
-  about X.25 for Linux is contained in the files
+  You can read more about X.25 at http://www.sangoma.com/x25.htm and
+  http://www.cisco.com/univercd/data/doc/software/11_0/rpcg/cx25.htm .
+  Information about X.25 for Linux is contained in the files
   Documentation/networking/x25.txt and
-  Documentation/networking/x25-iface.txt. 
+  Documentation/networking/x25-iface.txt.
 
   One connects to an X.25 network either with a dedicated network card
   using the X.21 protocol (not yet supported by Linux) or one can do
@@ -3593,39 +3707,59 @@ CONFIG_BRIDGE
   other third party bridge products. 
 
   In order to use this, you'll need the bridge configuration tools
-  available via FTP (user: anonymous) from
-  ftp://shadow.cabi.net/pub/Linux. Please read the Bridge mini-HOWTO
-  for more information. Note that if your box acts as a bridge, it
-  probably contains several Ethernet devices, but the kernel is not
-  able to recognize more than one at boot time without help; for
-  details read the Ethernet-HOWTO, available via FTP (user: anonymous)
-  in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. The Bridging code is
-  still in test. If unsure, say N.
+  available from ftp://shadow.cabi.net/pub/Linux . Please read the
+  Bridge mini-HOWTO for more information. Note that if your box acts
+  as a bridge, it probably contains several Ethernet devices, but the
+  kernel is not able to recognize more than one at boot time without
+  help; for details read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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 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.
+  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 you use modprobe or
+  kmod, you may also want to add "alias net-pf-17 af_packet" to 
+  /etc/conf.modules. 
+
+  If unsure, say Y.
+
+Packet socket: mmapped IO
+CONFIG_PACKET_MMAP
+  If you say Y here, the Packet protocol driver will use an IO
+  mechanism that results in faster communication.
+
+  If unsure, say N.
 
 Kernel/User network link driver
 CONFIG_NETLINK
-  This driver allows for two-way communication between certain parts
-  of the kernel or modules and user processes; the user processes are
-  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.  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.
+  This driver allows for two-way communication between the kernel and
+  user processes; the user processes communicate with the kernel by
+  reading from and writing to character special files in the /dev
+  directory having major mode 36.
+
+  So far, the kernel uses this feature to publish some network related
+  information if you say Y to "Routing messages", below. 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.
+  
+  This driver is also available as a module called netlink_dev.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.
 
 Routing messages
 CONFIG_RTNETLINK
@@ -3642,30 +3776,38 @@ CONFIG_NETLINK_DEV
 
 Asynchronous Transfer Mode (ATM)
 CONFIG_ATM
-  Kernel support for ATM. Note that you need a set of user-space programs
-  to actually make use of ATM. See Documentation/atm.txt for further
-  details.
+  ATM is a high-speed networking technology for Local Area Networks
+  and Wide Area Networks. It uses a fixed packet size and is
+  connection oriented, allowing for the negotiation of minimum
+  bandwidth requirements.
+  
+  In order to participate in an ATM network, your Linux box needs an
+  ATM networking card. If you have that, say Y here and to the driver
+  of your ATM card below.
+
+  Note that you need a set of user-space programs to actually make use
+  of ATM. See the file Documentation/atm.txt for further details.
 
 Classical IP over ATM
 CONFIG_ATM_CLIP
-  Classical IP over ATM for PVCs and SVCs, supporting InARP and ATMARP.
-  Typically you will either use LAN Emulation (LANE) or Classical IP to
-  communicate with other IP hosts on your ATM network.
+  Classical IP over ATM for PVCs and SVCs, supporting InARP and
+  ATMARP. Typically you will either use LAN Emulation (LANE) or
+  Classical IP to communicate with other IP hosts on your ATM network.
 
 Do NOT send ICMP if no neighbour
 CONFIG_ATM_CLIP_NO_ICMP
-  Normally, an ICMP host unreachable message is sent if a neighbour cannot
-  be reached because there is no VC to it in the kernel's ATMARP table.
-  This may cause problems when ATMARP table entries are briefly removed
-  during revalidation. If this configuration option is set to "yes",
-  packets to such neighbours are silently discarded instead.
+  Normally, an "ICMP host unreachable" message is sent if a neighbour
+  cannot be reached because there is no VC to it in the kernel's
+  ATMARP table. This may cause problems when ATMARP table entries are
+  briefly removed during revalidation. If you say Y here, packets to
+  such neighbours are silently discarded instead.
 
 LAN Emulation (LANE) support
 CONFIG_ATM_LANE
-  LAN Emulation emulates services of existing LANs across an ATM network.
-  Besides operating as a normal ATM end station client, Linux LANE client
-  can also act as an proxy client bridging packets between ELAN and
-  Ethernet segments. You need LANE if you want to try MPOA.
+  LAN Emulation emulates services of existing LANs across an ATM
+  network. Besides operating as a normal ATM end station client, Linux
+  LANE client can also act as an proxy client bridging packets between
+  ELAN and Ethernet segments. You need LANE if you want to try MPOA.
 
 Multi-Protocol Over ATM (MPOA) support
 CONFIG_ATM_MPOA
@@ -3676,50 +3818,52 @@ CONFIG_ATM_MPOA
 
 ATM over TCP
 CONFIG_ATM_TCP
-  ATM over TCP driver. Useful mainly for development and for experiments.
+  ATM over TCP driver. Useful mainly for development and for
+  experiments. If unsure, say N.
 
 Efficient Networks ENI155P
 CONFIG_ATM_ENI
-  Driver for the Efficient Networks ENI155p series and SMC ATM Power155
-  155 Mbps ATM adapters. Both, the versions with 512kB and 2MB on-board
-  RAM (Efficient calls them "C" and "S", respectively), and the FPGA and
-  the ASIC Tonga versions of the board are supported. The driver works
-  with MMF (-MF or ...F) and UTP-5 (-U5 or ...D) adapters.
+  Driver for the Efficient Networks ENI155p series and SMC ATM
+  Power155 155 Mbps ATM adapters. Both, the versions with 512kB and
+  2MB on-board RAM (Efficient calls them "C" and "S", respectively),
+  and the FPGA and the ASIC Tonga versions of the board are supported.
+  The driver works with MMF (-MF or ...F) and UTP-5 (-U5 or ...D)
+  adapters.
 
 Enable extended debugging
 CONFIG_ATM_ENI_DEBUG
-  Extended debugging records various events and displays that list when
-  an inconsistency is detected. This mechanism is faster than generally
-  using printks, but still has some impact on performance. Note that
-  extended debugging may create certain race conditions itself. Enable
-  this ONLY if you suspect problems with the driver.
+  Extended debugging records various events and displays that list
+  when an inconsistency is detected. This mechanism is faster than
+  generally using printks, but still has some impact on performance.
+  Note that extended debugging may create certain race conditions
+  itself. Enable this ONLY if you suspect problems with the driver.
 
 Fine-tune burst settings
 CONFIG_ATM_ENI_TUNE_BURST
-  In order to obtain good throughput, the ENI NIC can transfer multiple
-  words of data per PCI bus access cycle. Such a multi-word transfer is
-  called a burst.
+  In order to obtain good throughput, the ENI NIC can transfer
+  multiple words of data per PCI bus access cycle. Such a multi-word
+  transfer is called a burst.
 
   The default settings for the burst sizes are suitable for most PCI
-  chipsets. However, in some cases, large bursts may overrun buffers in
-  the PCI chipset and cause data corruption. In such cases, large bursts
-  must be disabled and only (slower) small bursts can be used. The burst
-  sizes can be set independently in the send (TX) and receive (RX)
-  direction.
+  chipsets. However, in some cases, large bursts may overrun buffers
+  in the PCI chipset and cause data corruption. In such cases, large
+  bursts must be disabled and only (slower) small bursts can be used.
+  The burst sizes can be set independently in the send (TX) and
+  receive (RX) direction.
 
   Note that enabling many different burst sizes in the same direction
-  may increase the cost of setting up a transfer such that the resulting
-  throughput is lower than when using only the largest available burst
-  size.
+  may increase the cost of setting up a transfer such that the
+  resulting throughput is lower than when using only the largest
+  available burst size.
 
   Also, sometimes larger bursts lead to lower throughput, e.g. on an
-  Intel 440FX board, a drop from 135 Mbps to 103 Mbps was observed when
-  going from 8W to 16W bursts.
+  Intel 440FX board, a drop from 135 Mbps to 103 Mbps was observed
+  when going from 8W to 16W bursts.
 
 Enable 16W TX bursts (discouraged)
 CONFIG_ATM_ENI_BURST_TX_16W
-  Burst sixteed words at once in the send direction. This may work with
-  recent PCI chipsets, but is known to fail with older chipsets.
+  Burst sixteen words at once in the send direction. This may work
+  with recent PCI chipsets, but is known to fail with older chipsets.
 
 Enable 8W TX bursts (recommended)
 CONFIG_ATM_ENI_BURST_TX_8W
@@ -3728,37 +3872,38 @@ CONFIG_ATM_ENI_BURST_TX_8W
 
 Enable 4W TX bursts (optional)
 CONFIG_ATM_ENI_BURST_TX_4W
-  Burst four words at once in the send direction. You may want to try this
-  if you have disabled 8W bursts. Enabling 4W if 8W is also set may or may
-  not improve throughput.
+  Burst four words at once in the send direction. You may want to try
+  this if you have disabled 8W bursts. Enabling 4W if 8W is also set
+  may or may not improve throughput.
   
 Enable 2W TX bursts (optional)
 CONFIG_ATM_ENI_BURST_TX_2W
-  Burst two words at once in the send direction. You may want to try this
-  if you have disabled 4W and 8W bursts. Enabling 2W if 4W or 8W are also
-  set may or may not improve throughput.
+  Burst two words at once in the send direction. You may want to try
+  this if you have disabled 4W and 8W bursts. Enabling 2W if 4W or 8W
+  are also set may or may not improve throughput.
 
 Enable 16W RX bursts (discouraged)
 CONFIG_ATM_ENI_BURST_RX_16W
-  Burst sixteen words at once in the receive direction. This may work with
-  recent PCI chipsets, but is known to fail with older chipsets.
+  Burst sixteen words at once in the receive direction. This may work
+  with recent PCI chipsets, but is known to fail with older chipsets.
 
 Enable 8W RX bursts (discouraged)
 CONFIG_ATM_ENI_BURST_RX_8W
-  Burst eight words at once in the receive direction. This may work with
-  recent PCI chipsets, but is known to fail with older chipsets, such as
-  the Intel Neptune series.
+  Burst eight words at once in the receive direction. This may work
+  with recent PCI chipsets, but is known to fail with older chipsets,
+  such as the Intel Neptune series.
 
 Enable 4W RX bursts (recommended)
 CONFIG_ATM_ENI_BURST_RX_4W
-  Burst four words at once in the receive direction. This is the default
-  setting. Enabling 4W if 8W is also set may or may not improve throughput.
+  Burst four words at once in the receive direction. This is the
+  default setting. Enabling 4W if 8W is also set may or may not
+  improve throughput.
 
 Enable 2W RX bursts (optional)
 CONFIG_ATM_ENI_BURST_RX_2W
-  Burst two words at once in the receive direction. You may want to try
-  this if you have disabled 4W and 8W bursts. Enabling 2W if 4W or 8W are
-  also set may or may not improve throughput.
+  Burst two words at once in the receive direction. You may want to
+  try this if you have disabled 4W and 8W bursts. Enabling 2W if 4W or
+  8W are also set may or may not improve throughput.
 
 ZeitNet ZN1221/ZN1225
 CONFIG_ATM_ZATM
@@ -3767,20 +3912,21 @@ CONFIG_ATM_ZATM
 
 Enable extended debugging
 CONFIG_ATM_ZATM_DEBUG
-  Extended debugging records various events and displays that list when
-  an inconsistency is detected. This mechanism is faster than generally
-  using printks, but still has some impact on performance. Note that
-  extended debugging may create certain race conditions itself. Enable
-  this ONLY if you suspect problems with the driver.
+  Extended debugging records various events and displays that list
+  when an inconsistency is detected. This mechanism is faster than
+  generally using printks, but still has some impact on performance.
+  Note that extended debugging may create certain race conditions
+  itself. Enable this ONLY if you suspect problems with the driver.
 
 Enable usec resolution timestamps
 CONFIG_ATM_ZATM_EXACT_TS
-  The uPD98401 SAR chip supports a high-resolution timer (approx. 30 MHz)
-  that is used for very accurate reception timestamps. Because that timer
-  overflows after 140 seconds, and also to avoid timer drift, time
-  measurements need to be periodically synchronized with the normal
-  system time. Enabling this feature will add some general overhead for
-  timer synchronization and also per-packet overhead for time conversion.
+  The uPD98401 SAR chip supports a high-resolution timer (approx. 30
+  MHz) that is used for very accurate reception timestamps. Because
+  that timer overflows after 140 seconds, and also to avoid timer
+  drift, time measurements need to be periodically synchronized with
+  the normal system time. Enabling this feature will add some general
+  overhead for timer synchronization and also per-packet overhead for
+  time conversion.
 
 IDT 77201 (NICStAR)
 CONFIG_ATM_NICSTAR
@@ -3837,8 +3983,8 @@ CONFIG_SCSI
   You also need to say Y here if you want support for the parallel
   port version of the 100 MB IOMEGA ZIP drive.
 
-  Please read the SCSI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. The
+  Please read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . The
   SCSI-Programming-HOWTO contains information about how to add or
   remove an SCSI device from a running Linux machine without
   rebooting.
@@ -3855,9 +4001,9 @@ SCSI disk support
 CONFIG_BLK_DEV_SD
   If you want to use a SCSI hard disk or the SCSI or parallel port
   version of the IOMEGA ZIP drive under Linux, say Y and read the
-  SCSI-HOWTO, the Disk-HOWTO and the Multi-Disk-HOWTO, available via
-  FTP (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
-  This is NOT for SCSI CDROMs.
+  SCSI-HOWTO, the Disk-HOWTO and the Multi-Disk-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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).
@@ -3871,8 +4017,8 @@ CONFIG_BLK_DEV_SD
 SCSI tape support
 CONFIG_CHR_DEV_ST
   If you want to use a SCSI tape drive under Linux, say Y and read the
-  SCSI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO and
+  SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , and
   drivers/scsi/README.st in the kernel source. This is NOT for SCSI
   CDROMs.
 
@@ -3885,8 +4031,8 @@ CONFIG_CHR_DEV_ST
 SCSI CDROM support
 CONFIG_BLK_DEV_SR
   If you want to use a SCSI CDROM under Linux, say Y and read the
-  SCSI-HOWTO and the CDROM-HOWTO from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Also make sure to say Y
+  SCSI-HOWTO and the CDROM-HOWTO at
+  http://metalab.unc.edu/mdw/linux.html#howto . Also make sure to say Y
   or M to "ISO 9660 CDROM filesystem support" later.
 
   This driver is also available as a module ( = code which can be
@@ -3909,12 +4055,12 @@ CONFIG_CHR_DEV_SG
   CDROMs or tapes, say Y here. These won't be supported by the kernel
   directly, so you need some additional software which knows how to
   talk to these devices using the SCSI protocol. For CD-writers, you
-  would need the program cdwrite, available via FTP (user: anonymous)
-  from ftp://metalab.unc.edu/pub/Linux/utils/disk-management; for
-  other devices, it's possible that you'll have to write the driver
-  software yourself, so have a look at the SCSI-HOWTO and at the
-  SCSI-Programming-HOWTO, both available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Please read the file
+  would need the program cdwrite, available from
+  ftp://metalab.unc.edu/pub/Linux/utils/disk-management ; for other
+  devices, it's possible that you'll have to write the driver software
+  yourself, so have a look at the SCSI-HOWTO and at the
+  SCSI-Programming-HOWTO, both available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Please read the file
   Documentation/scsi-generic.txt for more information.
 
   If you want to compile this as a module ( = code which can be
@@ -3979,10 +4125,9 @@ CONFIG_SCSI_AHA152X
   SCSI host adapters. It also works for the AVA-1505, but the IRQ etc.
   must be manually specified in this case.
 
-  It is explained in section 3.3 of the SCSI-HOWTO, available via FTP
-  (user: anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. You
-  might also want to read the comments at the top of
-  drivers/scsi/aha152x.c.
+  It is explained in section 3.3 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . You might also want to
+  read the comments at the top of drivers/scsi/aha152x.c.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -3992,11 +4137,11 @@ CONFIG_SCSI_AHA152X
 Adaptec AHA1542 support
 CONFIG_SCSI_AHA1542
   This is support for a SCSI host adapter. It is explained in section
-  3.4 of the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Note that Trantor was
-  recently purchased by Adaptec, and some former Trantor products are
-  being sold under the Adaptec name. If it doesn't work out of the
-  box, you may have to change some settings in drivers/scsi/aha1542.h.
+  3.4 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Note that Trantor was
+  purchased by Adaptec, and some former Trantor products are being
+  sold under the Adaptec name. If it doesn't work out of the box, you
+  may have to change some settings in drivers/scsi/aha1542.h.
   
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4006,8 +4151,8 @@ CONFIG_SCSI_AHA1542
 Adaptec AHA1740 support
 CONFIG_SCSI_AHA1740
   This is support for a SCSI host adapter. It is explained in section
-  3.5 of the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
+  3.5 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/aha1740.h.
 
@@ -4040,9 +4185,9 @@ CONFIG_SCSI_AIC7XXX
   Information on the configuration options for this controller can be
   found by checking the help file for each of the available
   configuration options. You should read drivers/scsi/README.aic7xxx
-  at a minimum before contacting the maintainer with any questions.  
-  The SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO can also be of great
+  at a minimum before contacting the maintainer with any questions.
+  The SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , can also be of great
   help.
 
   If you want to compile this driver as a module ( = code which can be
@@ -4052,26 +4197,37 @@ CONFIG_SCSI_AIC7XXX
 
 Enable or Disable Tagged Command Queueing by default
 CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT
-  This option causes the aic7xxx driver to attempt to use tagged command
-  queueing on any devices that claim to support it.  If this is set to yes,
-  you can still turn off TCQ on troublesome devices with the use of the
-  tag_info boot parameter.  See /usr/src/linux/drivers/scsi/README.aic7xxx
-  for more information on that and other aic7xxx setup commands.  If this
-  option is turned off, you may still enable TCQ on known good devices by
-  use of the tag_info boot parameter.
-  
-  If you are unsure about your devices then it is safest to say N here.
+  This option causes the aic7xxx driver to attempt to use Tagged
+  Command Queueing (TCQ) on all devices that claim to support it. 
+
+  TCQ 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. Because the device is
+  intelligent, it can optimize its operations (like head positioning)
+  based on its own request queue. Not all devices implement this
+  correctly. 
+
+  If you say Y here, you can still turn off TCQ on troublesome devices
+  with the use of the tag_info boot parameter. See the file
+  drivers/scsi/README.aic7xxx for more information on that and other
+  aic7xxx setup commands. If this option is turned off, you may still
+  enable TCQ on known good devices by use of the tag_info boot
+  parameter.
+
+  If you are unsure about your devices then it is safest to say N
+  here.
   
   However, TCQ can increase performance on some hard drives by as much
-  as 50% or more, so I would recommend that if you say N here, that you
-  at least read the README.aic7xxx file so you will know how to enable
-  this option manually should your drives prove to be safe in regards
-  to TCQ.
+  as 50% or more, so it is recommended that if you say N here, you
+  should at least read the README.aic7xxx file so you will know how to
+  enable this option manually should your drives prove to be safe in
+  regards to TCQ.
 
-  Conversely, certain drives are known to lock up or cause bus resets when
-  TCQ is enabled on them.  If you have a Western Digital Enterprise SCSI
-  drive for instance, then don't even bother to enable TCQ on it as the
-  drive will become unreliable, and it will actually reduce performance.
+  Conversely, certain drives are known to lock up or cause bus resets
+  when TCQ is enabled on them. If you have a Western Digital
+  Enterprise SCSI drive for instance, then don't even bother to enable
+  TCQ on it as the drive will become unreliable, and it will actually
+  reduce performance.
 
 Default number of TCQ commands per device
 CONFIG_AIC7XXX_CMDS_PER_DEVICE
@@ -4083,14 +4239,14 @@ CONFIG_AIC7XXX_CMDS_PER_DEVICE
   figure. If the number is too high for any particular device, the
   driver will automatically compensate usually after only 10 minutes
   of uptime. It will not hinder performance if some of your devices
-  eventually have their command depth reduced, but is a waste of memory
-  if all of your devices end up reducing this number down to a more
-  reasonable figure.
+  eventually have their command depth reduced, but is a waste of
+  memory if all of your devices end up reducing this number down to a
+  more reasonable figure.
   
-  NOTE: Certain very broken drives are known to lock up when given more
-  commands than they like to deal with.  Quantum Fireball drives are the
-  most common in this category.  For the Quantum Fireball drives I would
-  suggest no more than 8 commands per device.
+  NOTE: Certain very broken drives are known to lock up when given
+  more commands than they like to deal with. Quantum Fireball drives
+  are the most common in this category. For the Quantum Fireball
+  drives it is suggested to use no more than 8 commands per device.
 
   Default: 8
 
@@ -4134,12 +4290,12 @@ CONFIG_SCSI_IPS
 BusLogic SCSI support
 CONFIG_SCSI_BUSLOGIC
   This is support for BusLogic MultiMaster and FlashPoint SCSI Host
-  Adapters. Consult the SCSI-HOWTO, available via anonymous FTP from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO, and the files
+  Adapters. Consult the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , and the files
   README.BusLogic and README.FlashPoint in drivers/scsi for more
   information. If this driver does not work correctly without
   modification, please contact the author, Leonard N. Zubkoff, by
-  email to lnz@dandelion.com. 
+  email to lnz@dandelion.com.
 
   You can also build this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4157,9 +4313,9 @@ CONFIG_SCSI_OMIT_FLASHPOINT
 DTC3180/3280 SCSI support
 CONFIG_SCSI_DTC3280
   This is support for DTC 3180/3280 SCSI Host Adapters. Please read
-  the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO and the file
-  drivers/scsi/README.dtc3x80. 
+  the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , and the file
+  drivers/scsi/README.dtc3x80.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4175,8 +4331,7 @@ CONFIG_SCSI_EATA_DMA
   Note that this driver is obsolete; if you have one of the above SCSI
   Host Adapters, you should normally say N here and Y to "EATA
   ISA/EISA/PCI support", below. Please read the SCSI-HOWTO, available
-  via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  from http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4190,8 +4345,7 @@ CONFIG_SCSI_EATA_PIO
   host adapters could also use this driver but are discouraged from
   doing so, since this driver only supports hard disks and lacks
   numerous features. You might want to have a look at the SCSI-HOWTO,
-  available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  available from http://metalab.unc.edu/mdw/linux.html#howto . 
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4204,11 +4358,11 @@ CONFIG_SCSI_U14_34F
   The source at drivers/scsi/u14-34f.c contains some information about
   this hardware. If the driver doesn't work out of the box, you may
   have to change some settings in drivers/scsi/u14-34f.c. Read the
-  SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Note that there is also
+  SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Note that there is also
   another driver for the same hardware: "UltraStor SCSI support",
   below. You should say Y to both only if you want 24F support as
-  well. 
+  well.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4239,8 +4393,8 @@ CONFIG_SCSI_FUTURE_DOMAIN
   (TMC-1660/1680, TMC-1650/1670, TMC-3260, TMC-1610M/MER/MEX) and
   other adapters based on the Future Domain chipsets (Quantum
   ISA-200S, ISA-250MG; Adaptec AHA-2920A; and at least one IBM board).
-  It is explained in section 3.7 of the SCSI-HOWTO, available via FTP
-  (user: anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  It is explained in section 3.7 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   NOTE: Newer Adaptec AHA-2920C boards use the Adaptec AIC-7850 chip
   and should use the aic7xxx driver ("Adaptec AIC7xxx chipset SCSI
@@ -4254,19 +4408,24 @@ CONFIG_SCSI_FUTURE_DOMAIN
 
 Future Domain MCS-600/700 SCSI support
 CONFIG_SCSI_FD_MCS
- This is support for Future Domain MCS 600/700 MCA SCSI adapters. Some
- PS/2 computers are equipped with IBM Fast SCSI Adapter/A which is
- identical to the MCS 700 and hence also supported by this driver.
- This driver also supports the Reply SB16/SCSI card (the SCSI part).
- It supports multiple adapters in the same system.
+  This is support for Future Domain MCS 600/700 MCA SCSI adapters.
+  Some PS/2 computers are equipped with IBM Fast SCSI Adapter/A which
+  is identical to the MCS 700 and hence also supported by this driver.
+  This driver also supports the Reply SB16/SCSI card (the SCSI part).
+  It supports multiple adapters in the same system.
+
+  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 fd_mcs.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
 
 Generic NCR5380/53c400 SCSI support
 CONFIG_SCSI_GENERIC_NCR5380
   This is the generic NCR family of SCSI controllers, not to be
   confused with the NCR 53c7 or 8xx controllers. It is explained in
-  section 3.8 of the SCSI-HOWTO, available via FTP (user: anonymous)
-  at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work
-  out of the box, you may have to change some settings in
+  section 3.8 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  of the box, you may have to change some settings in
   drivers/scsi/g_NCR5380.h.
 
   This driver is also available as a module ( = code which can be
@@ -4293,9 +4452,9 @@ NCR53c7,8xx SCSI support
 CONFIG_SCSI_NCR53C7xx
   This is a driver for the 53c7 and 8xx NCR family of SCSI
   controllers, not to be confused with the NCR 5380 controllers. It is
-  explained in section 3.8 of the SCSI-HOWTO, available via FTP (user:
-  anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it
-  doesn't work out of the box, you may have to change some settings in
+  explained in section 3.8 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  of the box, you may have to change some settings in
   drivers/scsi/53c7,8xx.h. Please read drivers/scsi/README.ncr53c7xx
   for the available boot time command line options.
 
@@ -4344,11 +4503,11 @@ CONFIG_SCSI_NCR53C8XX
   Recent versions of the 53C8XX chips are better supported by the
   option "SYM53C8XX SCSI support", below.
 
-  Note: there is yet another driver for the 53c8xx family of controllers
-  ("NCR53c7,8xx SCSI support" above). If you want to use them both,
-  you need to say M to both and build them as modules, but only one
-  may be active at a time. If you have a 53c8xx board, you probably do
-  not want to use the "NCR53c7,8xx SCSI support".
+  Note: there is yet another driver for the 53c8xx family of
+  controllers ("NCR53c7,8xx SCSI support" above). If you want to use
+  them both, you need to say M to both and build them as modules, but
+  only one may be active at a time. If you have a 53c8xx board, you
+  probably do not want to use the "NCR53c7,8xx SCSI support".
 
   Please read drivers/scsi/README.ncr53c8xx for more information.
 
@@ -4365,14 +4524,14 @@ CONFIG_SCSI_SYM53C8XX
   NCR53C8XX and this SYM53C8XX drivers either as module or linked to
   the kernel image.
 
-  When both drivers are linked to the kernel, the SYM53C8XX driver is 
-  called first at initialization and you can use the 'excl=ioaddr' 
-  driver boot option to exclude attachment of adapters by the SYM53C8XX 
-  driver. For instance, entering 'sym53c8xx=excl:0xb400,excl=0xc000' at 
-  lilo prompt prevents adapters at io address 0xb400 and 0xc000 from 
-  being attached by the SYM53C8XX driver, thus allowing the NCR53C8XX 
-  driver to attach them. The 'excl' option is also supported by the 
-  NCR53C8XX driver.
+  When both drivers are linked into the kernel, the SYM53C8XX driver
+  is called first at initialization and you can use the 'excl=ioaddr'
+  driver boot option to exclude attachment of adapters by the
+  SYM53C8XX driver. For example, entering
+  'sym53c8xx=excl:0xb400,excl=0xc000' at the lilo prompt prevents
+  adapters at io address 0xb400 and 0xc000 from being attached by the
+  SYM53C8XX driver, thus allowing the NCR53C8XX driver to attach them.
+  The 'excl' option is also supported by the NCR53C8XX driver.
   
   Please read drivers/scsi/README.ncr53c8xx for more information.
 
@@ -4430,9 +4589,11 @@ default tagged command queue depth
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS
   "Tagged command queuing" is a feature of SCSI-2 which improves
   performance: the host adapter can send several SCSI commands to a
-  device's queue even if previous commands haven't finished yet. Some
-  SCSI devices don't implement this properly; if you want to disable
-  this feature, enter 0 or 1 here (it doesn't matter which).
+  device's queue even if previous commands haven't finished yet.
+  Because the device is intelligent, it can optimize its operations
+  (like head positioning) based on its own request queue. Some SCSI
+  devices don't implement this properly; if you want to disable this
+  feature, enter 0 or 1 here (it doesn't matter which).
 
   The default value is 8 and should be supported by most hard disks.
   This value can be overridden from the boot command line using the 
@@ -4513,8 +4674,8 @@ CONFIG_SCSI_IBMMCA
   'ibmmcascsi=display' as an additional kernel parameter. Try "man
   bootparam" or see the documentation of your boot loader about how to
   pass options to the kernel. The lilo procedure is also explained in
-  the SCSI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4590,9 +4751,9 @@ CONFIG_SCSI_IN2000
 
 Initio 91XXU(W) SCSI support
 CONFIG_SCSI_INITIO
-  This is support for the Initio 91XXU(W) SCSI host adapter.
-  Please read the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  This is support for the Initio 91XXU(W) SCSI host adapter. Please
+  read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4602,8 +4763,8 @@ CONFIG_SCSI_INITIO
 PAS16 SCSI support
 CONFIG_SCSI_PAS16
   This is support for a SCSI host adapter. It is explained in section
-  3.10 of the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
+  3.10 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/pas16.h.
   
@@ -4614,9 +4775,9 @@ CONFIG_SCSI_PAS16
 
 Initio INI-A100U2W SCSI support
 CONFIG_SCSI_INIA100
-  This is support for the Initio INI-A100U2W SCSI host adapter.
-  Please read the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  This is support for the Initio INI-A100U2W SCSI host adapter. Please
+  read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be 
   inserted in and removed from the running kernel whenever you want),
@@ -4626,8 +4787,8 @@ CONFIG_SCSI_INIA100
 PCI2000 support
 CONFIG_SCSI_PCI2000
   This is support for the PCI2000I EIDE interface card which acts as a
-  SCSI host adapter. Please read the SCSI-HOWTO, available via FTP
-  (user: anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  SCSI host adapter. Please read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module called pci2000.o ( = code
   which can be inserted in and removed from the running kernel
@@ -4637,8 +4798,8 @@ CONFIG_SCSI_PCI2000
 PCI2220i support
 CONFIG_SCSI_PCI2220I
   This is support for the PCI2220i EIDE interface card which acts as a
-  SCSI host adapter. Please read the SCSI-HOWTO, available via FTP
-  (user: anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  SCSI host adapter. Please read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module called pci2220i.o ( = code
   which can be inserted in and removed from the running kernel
@@ -4648,8 +4809,8 @@ CONFIG_SCSI_PCI2220I
 PSI240i support
 CONFIG_SCSI_PSI240I
   This is support for the PSI240i EIDE interface card which acts as a
-  SCSI host adapter. Please read the SCSI-HOWTO, available via FTP
-  (user: anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  SCSI host adapter. Please read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module called psi240i.o ( = code
   which can be inserted in and removed from the running kernel
@@ -4668,8 +4829,7 @@ CONFIG_SCSI_QLOGIC_FAS
 
   Information about this driver is contained in
   drivers/scsi/README.qlogicfas. You should also read the SCSI-HOWTO,
-  available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4686,8 +4846,8 @@ CONFIG_SCSI_QLOGIC_ISP
   access mode".
 
   Please read the file drivers/scsi/README.qlogicisp. You should also
-  read the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4707,9 +4867,8 @@ Seagate ST-02 and Future Domain TMC-8xx SCSI support
 CONFIG_SCSI_SEAGATE
   These are 8-bit SCSI controllers; the ST-01 is also supported by
   this driver. It is explained in section 3.9 of the SCSI-HOWTO,
-  available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
-  of the box, you may have to change some settings in
+  available from http://metalab.unc.edu/mdw/linux.html#howto . If it
+  doesn't work out of the box, you may have to change some settings in
   drivers/scsi/seagate.h.
 
   This driver is also available as a module ( = code which can be
@@ -4720,8 +4879,8 @@ CONFIG_SCSI_SEAGATE
 Trantor T128/T128F/T228 SCSI support
 CONFIG_SCSI_T128
   This is support for a SCSI host adapter. It is explained in section
-  3.11 of the SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
+  3.11 of the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/t128.h. Note that Trantor was purchased by Adaptec, and
   some former Trantor products are being sold under the Adaptec name.
@@ -4735,8 +4894,8 @@ UltraStor SCSI support
 CONFIG_SCSI_ULTRASTOR
   This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
   adapter family. This driver is explained in section 3.12 of the
-  SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
+  SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/ultrastor.h.
   
@@ -4776,8 +4935,8 @@ CONFIG_SCSI_EATA
   subsystem are probed as well.
 
   You want to read the start of drivers/scsi/eata.c and the
-  SCSI-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   Note that there is also another driver for the same hardware
   available: "EATA-DMA support". You should say Y to only one of them.
@@ -4816,8 +4975,8 @@ NCR53c406a SCSI support
 CONFIG_SCSI_NCR53C406A
   This is support for the NCR53c406a SCSI host adapter. For user
   configurable parameters, check out drivers/scsi/NCR53c406.c in the
-  kernel source. Also read the SCSI-HOWTO, available via FTP (user:
-  anonymous) at ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  kernel source. Also read the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4880,8 +5039,8 @@ AM53/79C974 PCI SCSI support
 CONFIG_SCSI_AM53C974
   This is support for the AM53/79C974 SCSI host adapters. Please read
   drivers/scsi/README.AM53C974 for details. Also, the SCSI-HOWTO,
-  available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO, is for you.
+  available from http://metalab.unc.edu/mdw/linux.html#howto , is for
+  you.
 
   Note that there is another driver for AM53C974 based adapters:
   "Tekram DC390(T) and Am53/79C974 (PCscsi) SCSI support", above. You
@@ -4902,12 +5061,6 @@ CONFIG_SCSI_MEGARAID
   say M here and read Documentation/modules.txt. The module will be
   called megaraid.o.
 
-###
-### What is this?
-###
-#Concurrent IO commands on MegaRAID
-#CONFIG_MEGARAID_MULTI_IO
-
 GDT SCSI Disk Array Controller support
 CONFIG_SCSI_GDTH
   This is a driver for all SCSI Disk Array Controllers (EISA/ISA/PCI) 
@@ -4935,8 +5088,8 @@ CONFIG_SCSI_PPA
 
   For more information about this driver and how to use it you should
   read the file drivers/scsi/README.ppa. You should also read the
-  SCSI-HOWTO, which is available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If you use this driver,
+  SCSI-HOWTO, which is available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If you use this driver,
   you will still be able to use the parallel port for other tasks,
   such as a printer; it is safe to compile both drivers into the
   kernel.
@@ -4962,8 +5115,8 @@ CONFIG_SCSI_IMM
 
   For more information about this driver and how to use it you should
   read the file drivers/scsi/README.ppa. You should also read the
-  SCSI-HOWTO, which is available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If you use this driver,
+  SCSI-HOWTO, which is available from
+  http://metalab.unc.edu/mdw/linux.html#howto . If you use this driver,
   you will still be able to use the parallel port for other tasks,
   such as a printer; it is safe to compile both drivers into the
   kernel.
@@ -5087,31 +5240,28 @@ CONFIG_NETDEVICES
   any other computer at all or if all your connections will be over a
   telephone line with a modem either via UUCP (UUCP is a protocol to
   forward mail and news between unix hosts over telephone lines; read
-  the UUCP-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO) or dialing up a shell
+  the UUCP-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto ) or dialing up a shell
   account or a BBS, even using term (term is a program which gives you
   almost full Internet connectivity if you have a regular dial up
   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)).
+  http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html ).
 
   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 (especially if you
-  plan to use more than one network card under Linux), available from
-  ftp://metalab.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 null modem cables) or CSLIP
-  (compressed SLIP) or PPP (Point to Point Protocol, a better and
-  newer replacement for SLIP) or PLIP (Parallel Line Internet Protocol
-  is mainly used to create a mini network by connecting the parallel
-  ports of two local machines) or AX.25/KISS (protocol for sending
-  Internet traffic over amateur radio links).
+  plan to use more than one network card under Linux)) or if you want
+  to use SLIP (Serial Line Internet Protocol is the protocol used to
+  send Internet traffic over telephone lines or null modem cables) or
+  CSLIP (compressed SLIP) or PPP (Point to Point Protocol, a better
+  and newer replacement for SLIP) or PLIP (Parallel Line Internet
+  Protocol is mainly used to create a mini network by connecting the
+  parallel ports of two local machines) or AX.25/KISS (protocol for
+  sending Internet traffic over amateur radio links).
 
   Make sure to read the NET-3-HOWTO. Eventually, you will have to read
   Olaf Kirch's excellent and free book "Network Administrator's
-  Guide", to be found in ftp://metalab.unc.edu/pub/Linux/docs/LDP. If
+  Guide", to be found in ftp://metalab.unc.edu/pub/Linux/docs/LDP . If
   unsure, say Y.
 
 Dummy net driver support
@@ -5120,11 +5270,11 @@ CONFIG_DUMMY
   this device is consigned into oblivion) with a configurable IP
   address. It is most commonly used in order to make your currently
   inactive SLIP address seem like a real address for local programs.
-  If you use SLIP or PPP, you might want to say Y here. Read about it
-  in the Network Administrator's Guide, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/LDP. Since this
+  If you use SLIP or PPP, you might want to say Y here. Since this
   thing often comes in handy, the default is Y. It won't enlarge your
-  kernel either. What a deal.
+  kernel either. What a deal. Read about it in the Network
+  Administrator's Guide, available from
+  http://metalab.unc.edu/mdw/linux.html#guide .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -5150,16 +5300,14 @@ CONFIG_SLIP
   ftp://metalab.unc.edu/pub/Linux/system/network/serial/ ) which
   allows you to use SLIP over a regular dial up shell connection. If
   you plan to use SLiRP, make sure to say Y to CSLIP, below. The
-  NET-3-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO, explains how to
+  NET-3-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , explains how to
   configure SLIP. Note that you don't need this option if you just
   want to run term (term is a program which gives you almost full
   Internet connectivity if you have a regular 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)). SLIP support will enlarge
-  your kernel by about 4 KB. If unsure, say N.
+  http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html ). SLIP
+  support will enlarge your kernel by about 4 KB. If unsure, say N.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -5173,13 +5321,12 @@ CONFIG_SLIP_COMPRESSED
   TCP/IP headers (not on the data itself), but it has to be supported
   on both ends. Ask your access provider if you are not sure and
   answer Y, just in case. You will still be able to use plain SLIP. If
-  you plan to use SLiRP, the SLIP emulator (available via FTP (user:
-  anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/system/network/serial/) which allows
+  you plan to use SLiRP, the SLIP emulator (available from
+  ftp://metalab.unc.edu/pub/Linux/system/network/serial/ ) which allows
   you to use SLIP over a regular dial up shell connection, you
-  definitely want to say Y here. The NET-3-HOWTO, available via FTP
-  (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO,
-  explains how to configure CSLIP. This won't enlarge your kernel.
+  definitely want to say Y here. The NET-3-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , explains how to
+  configure CSLIP. This won't enlarge your kernel.
 
 Keepalive and linefill
 CONFIG_SLIP_SMART
@@ -5201,23 +5348,30 @@ PPP (point-to-point protocol) support
 CONFIG_PPP
   PPP (Point to Point Protocol) is a newer and better SLIP. It serves
   the same purpose: sending Internet traffic over telephone (and other
-  serial) lines.  Most ISPs these days support PPP rather than SLIP.
+  serial) lines. Ask your access provider if they support it, because
+  otherwise you can't use it; most internet access providers these
+  days support PPP rather than SLIP.
 
   To use PPP, you need an additional program called pppd as described
   in Documentation/networking/ppp.txt and in the PPP-HOWTO, available
-  from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If you upgrade
+  at http://metalab.unc.edu/mdw/linux.html#howto . If you upgrade
   from an older kernel, you might need to upgrade pppd as well. The
   PPP option enlarges your kernel by about 16 KB.
 
-  Almost always, if you answer Y or M to this question, you should
-  give the same answer to the next question, about PPP support for
-  async serial ports.
+  There are actually two versions of PPP: the traditional PPP for
+  asynchronous lines, such as regular analog phone lines, and
+  synchronous PPP which can be used over digital ISDN lines for
+  example. If you want to use PPP over phone lines or other
+  asynchronous serial lines, you need to say Y (or M) here and also to
+  the next option, "PPP support for async serial ports". For PPP over
+  synchronous lines, you should say Y (or M) here and to "Support
+  synchronous PPP", below.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   If you said Y to "Version information on all symbols" above, then
   you cannot compile the PPP driver into the kernel; you can then only
-  compile it as a module. The module will be called ppp_generic.o.  If
+  compile it as a module. The module will be called ppp_generic.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.
@@ -5237,10 +5391,10 @@ PPP Deflate compression
 CONFIG_PPP_DEFLATE
   Support for the Deflate compression method for PPP, which uses the
   Deflate algorithm (the same algorithm that gzip uses) to compress
-  each PPP packet before it is sent over the wire.  The peer (the
-  machine at the other end of the PPP link, usually your ISP) has to
-  support the Deflate compression method as well for this to be
-  useful.
+  each PPP packet before it is sent over the wire. The machine at the
+  other end of the PPP link (usually your ISP) has to support the
+  Deflate compression method as well for this to be useful. Even if
+  they don't support it, it is safe to say Y here.
 
   This code is also available as a module (code which can be inserted
   into and removed from the running kernel).  If you want to compile
@@ -5250,15 +5404,19 @@ PPP BSD-Compress compression
 CONFIG_PPP_BSDCOMP
   Support for the BSD-Compress compression method for PPP, which uses
   the LZW compression method to compress each PPP packet before it is
-  sent over the wire.  The peer (the other end of the PPP link) has to
-  support the BSD-Compress compression method as well for this to be
-  useful.  The PPP Deflate compression method is preferable to
-  BSD-Compress, because it compresses better and is patent-free.
+  sent over the wire. The machine at the other end of the PPP link
+  (usually your ISP) has to support the BSD-Compress compression
+  method as well for this to be useful. Even if they don't support it,
+  it is safe to say Y here.
+
+  The PPP Deflate compression method ("PPP Deflate compression",
+  above) is preferable to BSD-Compress, because it compresses better
+  and is patent-free.
 
   Note that the BSD compression code will always be compiled as a
   module; it is called bsd_comp.o and will show up in the directory
   modules once you have said "make modules". If unsure, say N.
-
+ 
 Wireless LAN (non-hamradio)
 CONFIG_NET_RADIO
   Support for wireless LANs and everything having to do with radio,
@@ -5268,22 +5426,20 @@ CONFIG_NET_RADIO
   interfaces. 
 
   Some user-level drivers for scarab devices which don't require
-  special kernel support are available via FTP (user: anonymous) from
-  ftp://shadow.cabi.net/pub/Linux.
+  special kernel support are available from
+  ftp://shadow.cabi.net/pub/Linux .
 
 STRIP (Metricom Starmode radio IP)
 CONFIG_STRIP
   Say Y if you have a Metricom radio and intend to use Starmode Radio
   IP. STRIP is a radio protocol developed for the MosquitoNet project
-  (On the WWW at http://mosquitonet.stanford.edu/; to browse the WWW,
-  you need to have access to a machine on the Internet that has a
-  program like lynx or netscape) to send Internet traffic using
-  Metricom radios. Metricom radios are small, battery powered,
-  100kbit/sec packet radio transceivers, about the size and weight of
-  a cellular telephone. (You may also have heard them called
+  (on the WWW at http://mosquitonet.stanford.edu/ ) to send Internet
+  traffic using Metricom radios. Metricom radios are small, battery
+  powered, 100kbit/sec packet radio transceivers, about the size and
+  weight of a cellular telephone. (You may also have heard them called
   "Metricom modems" but we avoid the term "modem" because it misleads
   many people into thinking that you can plug a Metricom modem into a
-  phone line and use it as a modem.)  
+  phone line and use it as a modem.)
 
   You can use STRIP on any Linux machine with a serial port, although
   it is obviously most useful for people with laptop computers. If you
@@ -5308,14 +5464,14 @@ CONFIG_WAVELAN
   location).
 
   If you want to use an ISA WaveLAN card under Linux, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Some more specific
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Some more specific
   information is contained in Documentation/networking/wavelan.txt and
   in the source code drivers/net/wavelan.p.h.
 
   You will also need the wireless tools package available from
-  ftp://ftp.inka.de/pub/comp/Linux/networking/NetTools/contrib/.
-  Please read the man pages contained therein.
+  ftp://hyper.stanford.edu/pub/pcmcia/contrib/ . Please read the man
+  pages contained therein.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5325,14 +5481,16 @@ CONFIG_WAVELAN
 
 Aironet Arlan 655 & IC2200 DS support
 CONFIG_ARLAN
-  Aironet makes Arlan. www.aironet.com. Uses www.Telxon.com chip, which is
-  used on several similar cards. Driver is tested on 655 and IC2200 series. 
-  Look for http://www.ylenurme.ee/~elmer/655/ for latest information. 
-  Driver is build as two modules, arlan and arlan-proc. The later is /proc
-  interface and not needed most of time.
+  Aironet makes Arlan, a class of wireless LAN adapters. These use the
+  www.Telxon.com chip, which is also used on several similar cards.
+  This driver is tested on the 655 and IC2200 series cards. Look at
+  http://www.ylenurme.ee/~elmer/655/ for latest information.
+  
+  The driver is built as two modules, arlan and arlan-proc. The latter
+  is the /proc interface and is not needed most of time.
+  
   On some computers the card ends up in non-valid state after some time.
   Use a ping-reset script to clear it.
-   
 
 LAPB over Ethernet driver
 CONFIG_LAPBETHER
@@ -5360,6 +5518,39 @@ CONFIG_X25_ASY
   say M here and read Documentation/modules.txt. The module will be
   called x25_asy.o. If unsure, say N.
 
+PCMCIA ethernet cards (NE2000 compatibles: DE-650, ...)
+CONFIG_PCMCIA_PCNET
+  Say Y here if you intend to attach an NE2000 compatible PCMCIA
+  (PC-card) Ethernet networking card to your computer.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called pcnet_cs.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt. If unsure,
+  say N.
+
+3Com 3c589 PCMCIA card
+CONFIG_PCMCIA_3C589
+  Say Y here if you intend to attach a 3Com 3c589 PCMCIA
+  (PC-card) Ethernet networking card to your computer.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called 3c589_cs.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt. If unsure,
+  say N.
+
+Aviator/Raytheon 2.4MHz wireless
+CONFIG_PCMCIA_RAYCS
+  Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
+  (PC-card) wireless Ethernet networking card to your computer.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called ray_cs.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt. If unsure,
+  say N.
+
 PLIP (parallel port) support
 CONFIG_PLIP
   PLIP (Parallel Line Internet Protocol) is used to create a
@@ -5379,17 +5570,15 @@ CONFIG_PLIP
   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://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.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
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini as well as the
-  NET-3-HOWTO in ftp://metalab.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 by about 8 KB.
+  (http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html ) and
+  winsock or NCSA's telnet.
+
+  If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
+  as the NET-3-HOWTO, both available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Note that the PLIP
+  protocol has been changed and this PLIP driver won't work together
+  with the PLIP support in Linux versions 1.0.x. This option enlarges
+  your kernel by about 8 KB.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -5409,8 +5598,7 @@ CONFIG_EQUALIZER
 
   Say Y if you want this and read Documentation/networking/eql.txt.
   You may also want to read section 6.2 of the NET-3-HOWTO, available
-  via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  from http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5437,8 +5625,9 @@ CONFIG_ETHERTAP
   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 ethertap.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If you don't
-  know what to use this for, you don't need it.
+  module, say M here and read Documentation/modules.txt. 
+
+  If you don't know what to use this for, you don't need it.
 
 Sealevel Systems 4021 support
 CONFIG_SEALEVEL_4021
@@ -5458,11 +5647,10 @@ CONFIG_DLCI
   network, usually at the phone company) can carry several logical
   point-to-point connections to other computers connected to the frame
   relay network. For a general explanation of the protocol, check out
-  http://www.frforum.com/ 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.) To use frame relay, you need supporting hardware
-  (called FRAD) and certain programs from the net-tools package as
-  explained in Documentation/networking/framerelay.txt.
+  http://www.frforum.com/ on the WWW. To use frame relay, you need
+  supporting hardware (called FRAD) and certain programs from the
+  net-tools package as explained in
+  Documentation/networking/framerelay.txt.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5538,9 +5726,8 @@ CONFIG_WAN_ROUTER
   the price of an external router. If you have one of those cards and
   wish to use your Linux box as a WAN router, say Y here and also to
   the WAN driver for your card, below. You will then need the
-  wan-tools package which is available via FTP (user: anonymous) from
-  ftp://ftp.sangoma.com. Read Documentation/networking/wan-router.txt
-  for more information.
+  wan-tools package which is available from ftp://ftp.sangoma.com .
+  Read Documentation/networking/wan-router.txt for more information.
 
   The WAN routing support is also available as a module called
   wanrouter.o ( = code which can be inserted in and removed from the
@@ -5552,17 +5739,18 @@ CONFIG_WAN_ROUTER
 Fast switching (read help!)
 CONFIG_NET_FASTROUTE
   Saying Y here enables direct NIC-to-NIC (NIC = Network Interface
-  Card) data transfers, which is fast.
+  Card) data transfers on the local network, which is fast.
+
+  IMPORTANT NOTE: This option is NOT COMPATIBLE with "Network packet
+  filtering" (CONFIG_NETFILTER). Say N here if you say Y there.
 
-    *** This option is NOT COMPATIBLE with several important ***
-    *** networking options: especially CONFIG_NETFILTER.     ***
-    *** Say N here if you intend to use Linux as a firewall. ***
+  However, it will work with all options in the "IP: advanced router"
+  section (except for "IP: use TOS value as routing key" and
+  "IP: use FWMARK value as routing key").
 
-  However, it will work with all options in CONFIG_IP_ADVANCED_ROUTER
-  section (except for CONFIG_IP_ROUTE_TOS and CONFIG_IP_ROUTE_FWMARK).
   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/fastroute-8390.tar.gz).
+  them, a modified 8390 driver can be found at
+  ftp://ftp.inr.ac.ru/ip-routing/fastroute/fastroute-8390.tar.gz ).
 
   If unsure, say N.
 
@@ -5570,40 +5758,41 @@ Forwarding between high speed interfaces
 CONFIG_NET_HW_FLOWCONTROL
   This option enables NIC (Network Interface Card) hardware throttling
   during periods of 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/fastroute-8390.tar.gz).
-  Really, this option is applicable to any machine attached to a fast enough
-  network, and even a 10 Mb NIC is able to kill a not very slow box,
-  such as a 120MHz Pentium.
+  of device drivers support it (really only one -- tulip, a modified
+  8390 driver can be found at
+  ftp://ftp.inr.ac.ru/ip-routing/fastroute/fastroute-8390.tar.gz ). 
+
+  Really, this option is applicable to any machine attached to a fast
+  enough network, and even a 10 Mb NIC is able to kill a not very slow
+  box, such as a 120MHz Pentium.
 
   However, do not say Y here if you did not experience any serious
   problems.
 
-CPU is too slow to handle full bandwidth
-CONFIG_CPU_IS_SLOW
-  If you suspect that your CPU is not fast enough to handle the
-  full bandwidth of your network connection, try saying Y here. If
-  unsure, say N.
-
 QoS and/or fair queueing
 CONFIG_NET_SCHED
-  When the kernel has several packets to send out over the network
-  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 for how to do this "fairly"; they are
-  called packet schedulers. If you want to stick to the default
-  scheduling algorithm, say N here. If you want to experiment with a
-  couple of different algorithms, say Y. You can then attach different
-  schedulers to different network devices. Currently, this is only
-  recommended for experts.
+  When the kernel has several packets to send out over a network
+  device, it has to decide which ones to send first, which ones to
+  delay, and which ones to drop. This is the job of the packet
+  scheduler, and several different algorithms for how to do this
+  "fairly" have been proposed.
+
+  If you say N here, you will get the standard packet scheduler, which
+  is a FIFO (first come, first served). If you say Y here, you will be
+  able to choose from among several alternative algorithms which can
+  then be attached to different network devices. This is useful for
+  example if some of your network devices are real time devices that
+  need a certain minimum data flow rate, or if you need to limit the
+  maximum data flow rate for traffic which matches specified criteria.
+  This code is considered to be experimental.
 
   To administer these schedulers, you'll need the user-level utilities
-  from the package iproute2+tc at ftp://ftp.inr.ac.ru/ip-routing/
+  from the package iproute2+tc at ftp://ftp.inr.ac.ru/ip-routing/ .
+  That package also contains some documentation; for more, check out
+  http://snafu.freedom.org/linux2.2/iproute-notes.html .
 
   If you say Y here and to "/proc filesystem" below, you will be able
-  to read status information about priority schedulers from the file
+  to read status information about packet schedulers from the file
   /proc/net/psched.
   
   The available schedulers are listed in the following questions; you
@@ -5615,9 +5804,17 @@ CONFIG_NET_SCH_CBQ
   scheduling algorithm for some of your network devices. This
   algorithm classifies the waiting packets into a tree-like hierarchy
   of classes; the leaves of this tree are in turn scheduled by
-  separate algorithms (called "disciplines" in this context) which you
-  can choose below from among the various queueing algorithms. See the
-  top of net/sched/sch_cbq.c for references about the CBQ algorithm.
+  separate algorithms (called "disciplines" in this context).
+
+  See the top of net/sched/sch_cbq.c for references about the CBQ
+  algorithm.
+  
+  CBQ is a commonly used scheduler, so if you're unsure, you should
+  say Y here. Then say Y to all the queueing algorithms below that you
+  want to use as CBQ disciplines. Then say Y to "Packet classifier
+  API" and say Y to all the classifiers you want to use; a classifier
+  is a routine that allows you to sort your outgoing traffic into
+  classes based on a certain criterion.
 
   This code is also available as a module called sch_cbq.o ( = code
   which can be inserted in and removed from the running kernel
@@ -5639,11 +5836,17 @@ CONFIG_NET_SCH_CSZ
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
+#ATM pseudo-scheduler
+#CONFIG_NET_SCH_ATM
+#
+# ???
+#
+  
 The simplest PRIO pseudo scheduler
 CONFIG_NET_SCH_PRIO
   Say Y here if you want to use an n-band priority queue packet
   "scheduler" for some of your network devices or as a leaf discipline
-  for the CBQ scheduling algorithm. 
+  for the CBQ scheduling algorithm. If unsure, say Y.
 
   This code is also available as a module called sch_prio.o ( = code
   which can be inserted in and removed from the running kernel
@@ -5655,7 +5858,7 @@ CONFIG_NET_SCH_RED
   Say Y here if you want to use the Random Early Detection (RED)
   packet scheduling algorithm for some of your network devices (see
   the top of net/sched/sch_red.c for details and references about the
-  algorithm). 
+  algorithm).
 
   This code is also available as a module called sch_red.o ( = code
   which can be inserted in and removed from the running kernel
@@ -5705,7 +5908,7 @@ QoS support
 CONFIG_NET_QOS
   Say Y here if you want to include Quality Of Service scheduling
   features, which means that you will be able to request certain
-  rate-of-flow limits for your net devices.
+  rate-of-flow limits for your network devices.
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -5720,24 +5923,70 @@ CONFIG_NET_ESTIMATOR
 Packet classifier API
 CONFIG_NET_CLS
   The CBQ scheduling algorithm requires that network packets which are
-  scheduled to be sent out over a network device be classified in some
-  way. If you say Y here, you will get a choice of several different
-  packet classifiers with the following questions. 
-#
-# Routing tables based classifier
-# CONFIG_NET_CLS_ROUTE
-#
-# Firewall based classifier
-# CONFIG_NET_CLS_FW
-#
-# U32 classifier
-# CONFIG_NET_CLS_U32
-#
-# Special RSVP classifier
-# CONFIG_NET_CLS_RSVP
-#
-# Special RSVP classifier for IPv6
-# CONFIG_NET_CLS_RSVP6
+  scheduled to be sent out over a network device be classified
+  according to some criterion. If you say Y here, you will get a
+  choice of several different packet classifiers with the following
+  questions.
+
+Routing tables based classifier
+CONFIG_NET_CLS_ROUTE
+  If you say Y here, you will be able to classify outgoing packets
+  according to the route table entry they matched. If unsure, say Y.
+
+  This code is also available as a module called cls_route.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.
+
+Firewall based classifier
+CONFIG_NET_CLS_FW
+  If you say Y here, you will be able to classify outgoing packets
+  according to firewall criteria you specified.
+
+  This code is also available as a module called cls_fw.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.
+
+U32 classifier
+CONFIG_NET_CLS_U32
+  If you say Y here, you will be able to classify outgoing packets
+  according to their destination address. If unsure, say Y.
+
+  This code is also available as a module called cls_u32.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
+
+Special RSVP classifier
+CONFIG_NET_CLS_RSVP
+  The Resource Reservation Protocol (RSVP) permits end systems to
+  request a minimum and maximum data flow rate for a connection; this
+  is important for real time data such as streaming sound or video.
+
+  Say Y here if you want to be able to classify outgoing packets based
+  on their RSVP requests.
+
+  This code is also available as a module called cls_rsvp.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
+
+Special RSVP classifier for IPv6
+CONFIG_NET_CLS_RSVP6
+  The Resource Reservation Protocol (RSVP) permits end systems to
+  request a minimum and maximum data flow rate for a connection; this
+  is important for real time data such as streaming sound or video.
+
+  Say Y here if you want to be able to classify outgoing packets based
+  on their RSVP requests and you are using the new Internet Protocol
+  IPv6 as opposed to the older and more common IPv4.
+
+  This code is also available as a module called cls_rsvp6.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
+
 #
 # Ingres traffic policing
 # CONFIG_NET_CLS_POLICE
@@ -5781,6 +6030,12 @@ CONFIG_COSA
   The module will be called cosa.o. For general information about
   modules read Documentation/modules.txt.
 
+# Fibre Channel driver support
+# CONFIG_NET_FC
+
+# Interphase 5526 Tachyon chipset based adaptor support
+# CONFIG_IPHASE5526
+
 Red Creek Hardware VPN (EXPERIMENTAL)
 CONFIG_RCPCI
   This is a driver for hardware which provides a Virtual Private
@@ -5807,16 +6062,15 @@ CONFIG_WAN_DRIVERS
 
 Sangoma WANPIPE(tm) multiprotocol cards
 CONFIG_VENDOR_SANGOMA
-  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; you may then also want to read the file
-  Documentation/networking/wanpipe.txt. The next questions will ask
-  you about the protocols you want the driver to support.
+  WANPIPE from Sangoma Technologies Inc. (http://www.sangoma.com ) is a
+  family of intelligent multiprotocol WAN adapters with data transfer
+  rates up to T1 (1.544 Mbps). They are also known as Synchronous Data
+  Link Adapters (SDLA) and designated S502E(A), S503 or S508. These
+  cards support the X.25, Frame Relay, and PPP protocols. If you have
+  one or more of these cards, say Y to this option; you may then also
+  want to read the file Documentation/networking/wanpipe.txt. The next
+  questions will ask you about the protocols you want the driver to
+  support.
 
   The driver will be compiled as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5858,23 +6112,22 @@ CONFIG_WANPIPE_PPP
 Cyclom 2X(tm) multiprotocol cards
 CONFIG_CYCLADES_SYNC
   Cyclom 2X from Cyclades Corporation (http://www.cyclades.com and
-  http://www.cyclades.com.br; to browse the WWW, you need to have
-  access to a machine on the Internet that has a program like lynx or
-  netscape) is an intelligent multiprotocol WAN adapter with data
-  transfer rates up to 512 Kbps). These cards support the X.25 and SNA
-  related protocols. If you have one or more of these cards, say Y to
-  this option. The next questions will ask you about the protocols you
-  want the driver to support (for now only X.25 is supported).
+  http://www.cyclades.com.br ) is an intelligent multiprotocol WAN
+  adapter with data transfer rates up to 512 Kbps. These cards support
+  the X.25 and SNA related protocols. If you have one or more of these
+  cards, say Y to this option. The next questions will ask you about
+  the protocols you want the driver to support (for now only X.25 is
+  supported).
 
   While no documentation is available at this time please grab the
   wanconfig tarball in http://www.conectiva.com.br/~acme/cycsyn-devel
   (with minor changes to make it compile with the current wanrouter
   include files; efforts are being made to use the original package
-  available at ftp://ftp.sangoma.com).
+  available at ftp://ftp.sangoma.com ).
 
   Feel free to contact me or the cycsyn-devel mailing list at
   acme@conectiva.com.br and cycsyn-devel@bazar.conectiva.com.br for
-  aditional details, I hope to have documentation available as soon
+  additional details, I hope to have documentation available as soon
   as possible.
 
   The driver will be compiled as a module ( = code which can be
@@ -5886,6 +6139,7 @@ Cyclom 2X X.25 support
 CONFIG_CYCLOMX_X25
   Say Y to this option if you are planning to connect a Cyclom 2X card
   to an X.25 network. 
+
   If you say N, the X.25 support will not be included in the driver
   (saves about 11 KB of kernel memory).
 
@@ -5906,9 +6160,9 @@ CONFIG_NET_ETHERNET
 
   If your Linux machine will be connected to an Ethernet and you have
   an Ethernet network interface card (NIC) installed in your computer,
-  say Y here and read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. You will
-  then also have to say Y to the driver for your particular NIC.
+  say Y here and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . You will then also have
+  to say Y to the driver for your particular NIC.
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -5933,8 +6187,8 @@ CONFIG_SUN_INTEL
 Western Digital/SMC cards
 CONFIG_NET_VENDOR_SMC
   If you have a network (Ethernet) card belonging to this class, say Y
-  and read the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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
@@ -5944,8 +6198,8 @@ CONFIG_NET_VENDOR_SMC
 WD80*3 support
 CONFIG_WD80x3
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5956,9 +6210,8 @@ CONFIG_WD80x3
 SMC Ultra MCA support
 CONFIG_ULTRAMCA
   If you have a network (Ethernet) card of this type and are running
-  an MCA based system (PS/2), say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5969,8 +6222,8 @@ CONFIG_ULTRAMCA
 SMC Ultra support
 CONFIG_ULTRA
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
   
   Important: There have been many reports that, with some motherboards
   mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
@@ -5988,8 +6241,8 @@ CONFIG_ULTRA
 SMC Ultra32 EISA support
 CONFIG_ULTRA32
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6004,8 +6257,7 @@ CONFIG_SMC9194
   another SMC9192/9194 based chipset. Say Y if you want it compiled
   into the kernel, and read the file
   Documentation/networking/smc9.txt and the Ethernet-HOWTO, available
-  via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  from http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you
@@ -6018,8 +6270,8 @@ CONFIG_NE2K_PCI
   This driver is for NE2000 compatible PCI cards. It will not work
   with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
   support" below). If you have a PCI NE2000 network (Ethernet) card,
-  say Y and read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  say Y and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6031,8 +6283,7 @@ Racal-Interlan (Micom) NI cards
 CONFIG_NET_VENDOR_RACAL
   If you have a network (Ethernet) card belonging to this class, such
   as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
-  available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  available from http://metalab.unc.edu/mdw/linux.html#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
@@ -6042,9 +6293,9 @@ CONFIG_NET_VENDOR_RACAL
 NI5010 support
 CONFIG_NI5010
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Note that this is still
-  experimental code. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Note that this is still
+  experimental code.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6055,8 +6306,8 @@ CONFIG_NI5010
 NI5210 support
 CONFIG_NI52
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6067,8 +6318,8 @@ CONFIG_NI52
 NI6510 support
 CONFIG_NI65
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6080,22 +6331,33 @@ RealTek 8129/8139 (not 8019/8029!) support
 CONFIG_RTL8139
   This is a driver for the Fast Ethernet PCI network cards based on
   the RTL8129 and RTL8139 chips. If you have one of those, say Y and
-  read the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called rtl8139.o.
 
+SiS 900 PCI Fast Ethernet Adapter support
+CONFIG_SIS900
+  This is a driver for the Silicon Integrated System Corporation 900
+  Fast Ethernet PCI network card. If you have one of those, say Y and
+  read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
+
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. This is recommended.
+  The module will be called sis900.o.
+
 Packet Engines Yellowfin Gigabit-NIC support
 CONFIG_YELLOWFIN
   Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
   adapter. This adapter is used by the Beowulf Linux cluster project.
   See http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html for
   more information about this driver in particular and Beowulf in
-  general (to browse the WWW, you need to have access to a machine on
-  the Internet that has a program like lynx or netscape).
+  general.
 
   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),
@@ -6104,16 +6366,19 @@ CONFIG_YELLOWFIN
 
 General Instruments Surfboard 1000
 CONFIG_NET_SB1000
-  This is a driver for the General Instrument SURFboard 1000 internal cable
-  modem.  This is an ISA card which is used by a number of cable TV companies
-  to provide cable modem access.  It's a one-way downstream-only cable modem,
-  meaning that your upstream net link is provided by your regular phone modem.
-
-  At present this driver only compiles as a module, so say M here if you
-  have this card.  Then read Documentation/networking/README.sb1000 for
-  information on how to use this module, as it needs special ppp scripts for
-  establishing a connection.  Further documentation and the necessary scripts
-  can be found at:
+  This is a driver for the General Instrument (also known as
+  NextLevel) SURFboard 1000 internal
+  cable modem. This is an ISA card which is used by a number of cable
+  TV companies to provide cable modem access. It's a one-way
+  downstream-only cable modem, meaning that your upstream net link is
+  provided by your regular phone modem.
+
+  At present this driver only compiles as a module, so say M here if
+  you have this card. The module will be called sb1000.o. Then read
+  Documentation/networking/README.sb1000 for information on how to use
+  this module, as it needs special ppp scripts for establishing a
+  connection. Further documentation and the necessary scripts can be
+  found at:
 
   http://www.jacksonville.net/~fventuri/
   http://home.adelphia.net/~siglercm/sb1000.html
@@ -6149,8 +6414,8 @@ CONFIG_ACENIC_OMIT_TIGON_I
 AMD LANCE and PCnet (AT1500 and NE2100) support
 CONFIG_LANCE
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Some LinkSys cards are
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Some LinkSys cards are
   of this type.
 
   If you want to compile this driver as a module ( = code which can be
@@ -6161,8 +6426,8 @@ CONFIG_LANCE
 3COM cards
 CONFIG_NET_VENDOR_3COM
   If you have a network (Ethernet) card belonging to this class, say Y
-  and read the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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
@@ -6172,8 +6437,8 @@ CONFIG_NET_VENDOR_3COM
 3c501 support
 CONFIG_EL1
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Also, consider buying a
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Also, consider buying a
   new card, since the 3c501 is slow, broken, and obsolete: you will
   have problems. Some people suggest to ping ("man ping") a nearby
   machine every minute ("man cron") when using this card.
@@ -6187,8 +6452,8 @@ CONFIG_EL1
 3c503 support
 CONFIG_EL2
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6200,8 +6465,8 @@ CONFIG_EL2
 CONFIG_ELPLUS
   Information about this network (Ethernet) card can be found in
   Documentation/networking/3c505.txt. If you have a card of this type,
-  say Y and read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  say Y and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6212,8 +6477,8 @@ CONFIG_ELPLUS
 3c507 support
 CONFIG_EL16
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6224,8 +6489,8 @@ CONFIG_EL16
 3c523 support 
 CONFIG_ELMC
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6236,8 +6501,8 @@ CONFIG_ELMC
 3c527 support
 CONFIG_ELMC_II
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6249,8 +6514,7 @@ CONFIG_ELMC_II
 CONFIG_EL3
   If you have a network (Ethernet) card belonging to the 3Com
   EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
-  via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  from http://metalab.unc.edu/mdw/linux.html#howto .
 
   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
@@ -6266,10 +6530,10 @@ CONFIG_EL3
 CONFIG_VORTEX
   If you have a 3Com "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597)
   or "Boomerang" series (EtherLink XL 3c900 or 3c905) network
-  (Ethernet) card, say Y and read the Ethernet-HOWTO, available via
-  FTP (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
-  More specific information is in Documentation/networking/vortex.txt
-  and in the comments at the beginning of drivers/net/3c59x.c.
+  (Ethernet) card, say Y and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . More specific
+  information is in Documentation/networking/vortex.txt and in the
+  comments at the beginning of drivers/net/3c59x.c.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6282,8 +6546,9 @@ CONFIG_NET_ISA
   bus system (that's the way the cards talks to the other components
   of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
   Make sure you know the name of your card. Read the Ethernet-HOWTO,
-  available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. If unsure, say Y.
+  available from http://metalab.unc.edu/mdw/linux.html#howto . 
+
+  If unsure, say Y.
 
   Note that the answer to this question doesn't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -6301,9 +6566,8 @@ CONFIG_ARCNET
   support" below.
 
   You might also want to have a look at the Ethernet-HOWTO, available
-  via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO (even though ARCnet is
-  not really Ethernet).
+  from http://metalab.unc.edu/mdw/linux.html#howto (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).
@@ -6389,8 +6653,8 @@ CONFIG_ARCNET_COM20020
 Cabletron E21xx support
 CONFIG_E2100
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6402,8 +6666,8 @@ CS89x0 support
 CONFIG_CS89x0
   Support for CS89x0 chipset based Ethernet cards. If you have a
   network (Ethernet) card of this type, say Y and read the
-  Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO as well as
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto as well as
   Documentation/networking/cs89x0.txt.
 
   If you want to compile this as a module ( = code which can be
@@ -6415,8 +6679,8 @@ CONFIG_CS89x0
 DEPCA support
 CONFIG_DEPCA
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO as well as
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto as well as
   drivers/net/depca.c.
 
   If you want to compile this as a module ( = code which can be
@@ -6430,8 +6694,8 @@ CONFIG_EWRK3
   This driver supports the DE203, DE204 and DE205 network (Ethernet)
   cards. If this is for you, say Y and read
   Documentation/networking/ewrk3.txt in the kernel source as well as
-  the Ethernet-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6442,14 +6706,20 @@ CONFIG_EWRK3
 SEEQ8005 support
 CONFIG_SEEQ8005
   This is a driver for the SEEQ 8005 network (Ethernet) card. If this
-  is for you, read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  is for you, read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt as well as
+  Documentation/networking/net-modules.txt. The module will be called
+  ewrk3.o.
 
 AT1700/1720 support
 CONFIG_AT1700
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6461,8 +6731,8 @@ CONFIG_AT1700
 FMV-181/182/183/184 support
 CONFIG_FMV18X
   If you have a Fujitsu FMV-181/182/183/184 network (Ethernet) card,
-  say Y and read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  say Y and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   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.
@@ -6477,8 +6747,8 @@ EtherExpress PRO support
 CONFIG_EEXPRESS_PRO
   If you have a network (Ethernet) card of this type, say Y. Note
   however that the EtherExpress PRO/100 Ethernet card has its own
-  separate driver. Please read the Ethernet-HOWTO, available via FTP
-  (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  separate driver. Please read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6489,8 +6759,8 @@ CONFIG_EEXPRESS_PRO
 EtherExpress support
 CONFIG_EEXPRESS
   If you have an EtherExpress16 network (Ethernet) card, say Y and
-  read the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Note that the Intel
+  read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Note that the Intel
   EtherExpress16 card used to be regarded as a very poor choice
   because the driver was very unreliable. We now have a new driver
   that should do better.
@@ -6504,8 +6774,8 @@ CONFIG_EEXPRESS
 HP PCLAN+ (27247B and 27252A) support
 CONFIG_HPLAN_PLUS
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6516,8 +6786,8 @@ CONFIG_HPLAN_PLUS
 HP PCLAN (27245 and other 27xxx series) support
 CONFIG_HPLAN
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6528,8 +6798,8 @@ CONFIG_HPLAN
 HP 10/100VG PCLAN (ISA, EISA, PCI) support
 CONFIG_HP100
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6540,9 +6810,9 @@ CONFIG_HP100
 NE2000/NE1000 support
 CONFIG_NE2000
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Many Ethernet cards
-  without a specific driver are compatible with NE2000. 
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Many Ethernet cards
+  without a specific driver are compatible with NE2000.
 
   If you have a PCI NE2000 card however, say N here and Y to "PCI
   NE2000 support", above. If you have a NE2000 card and are running on
@@ -6559,14 +6829,14 @@ CONFIG_NE2000
 SK_G16 support
 CONFIG_SK_G16
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
 NE/2 (ne2000 MCA version) support
 CONFIG_NE2_MCA
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6576,24 +6846,24 @@ CONFIG_NE2_MCA
 
 SKnet MCA support
 CONFIG_SKMC
-  This are Micro Channel ethernet adapters.  You need to set CONFIG_MCA
-  to use this driver.  It's both available as an in-kernel driver and
-  as a module ( = code which can be inserted in and removed from the
-  running kernel whenever you want). If you want to compile it as a module,
-  say M here and read Documentation/modules.txt as well as
-  Documentation/networking/net-modules.txt. 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.  Supported
-  cards are the SKnet Junior MC2 and the SKnet MC2(+).  Distinguishing
-  both cards is done automatically.  Note that using multiple boards
-  of different type hasn't been tested with this driver.
+  These are Micro Channel ethernet adapters. You need to say Y to "MCA
+  support" in order to use this driver. Supported cards are the SKnet
+  Junior MC2 and the SKnet MC2(+). The driver automatically
+  distinguishes between the two cards. Note that using multiple boards
+  of different type hasn't been tested with this driver. Say Y if you
+  have one of these ethernet adapters.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module is called sk_mca.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.
 
 EISA, VLB, PCI and on board controllers
 CONFIG_NET_EISA
   This is another class of network cards which attach directly to the
   bus. If you have one of those, say Y and read the Ethernet-HOWTO,
-  available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  available from http://metalab.unc.edu/mdw/linux.html#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
@@ -6604,8 +6874,8 @@ CONFIG_NET_EISA
 AMD PCnet32 (VLB and PCI) support
 CONFIG_PCNET32
   If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
-  answer Y here and read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  answer Y here and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6616,8 +6886,8 @@ CONFIG_PCNET32
 Ansel Communications EISA 3200 support
 CONFIG_AC3200
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6628,8 +6898,8 @@ CONFIG_AC3200
 Mylex EISA LNE390A/LNE390B support
 CONFIG_LNE390
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6640,8 +6910,8 @@ CONFIG_LNE390
 Novell/Eagle/Microdyne NE3210 EISA support
 CONFIG_NE3210
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Note that this driver
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Note that this driver
   will NOT WORK for NE3200 cards as they are completely different.
 
   This driver is also available as a module ( = code which can be
@@ -6653,8 +6923,8 @@ CONFIG_NE3210
 Apricot Xen-II on board Ethernet
 CONFIG_APRICOT
   If you have a network (Ethernet) controller of this type, say Y and
-  read the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6667,8 +6937,8 @@ CONFIG_DE4X5
   This is support for the DIGITAL series of PCI/EISA Ethernet cards.
   These include the DE425, DE434, DE435, DE450 and DE500 models. If
   you have a network card of this type, say Y and read the
-  Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. More specific
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . More specific
   information is contained in Documentation/networking/de4x5.txt.
 
   This driver is also available as a module ( = code which can be
@@ -6685,10 +6955,9 @@ CONFIG_DEC_ELCP
   of this type. (If your card is NOT SMC EtherPower 10/100 PCI
   (smc9332dst), you can also try the driver for "Generic DECchip"
   cards, above. However, most people with a network card of this type
-  will say Y here.) Do read the Ethernet-HOWTO, available via FTP
-  (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
-  More specific information is contained in
-  Documentation/networking/tulip.txt.
+  will say Y here.) Do read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . More specific
+  information is contained in Documentation/networking/tulip.txt.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6701,8 +6970,8 @@ CONFIG_DGRS
   This is support for the Digi International RightSwitch series of
   PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6
   models. If you have a network card of this type, say Y and read the
-  Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. More specific
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . More specific
   information is contained in Documentation/networking/dgrs.txt.
 
   This driver is also available as a module ( = code which can be
@@ -6714,8 +6983,8 @@ CONFIG_DGRS
 EtherExpress PRO/100 support
 CONFIG_EEXPRESS_PRO100
   If you have an Intel EtherExpress PRO/100 PCI network (Ethernet)
-  card, say Y and read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  card, say Y and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6726,8 +6995,8 @@ CONFIG_EEXPRESS_PRO100
 ICL EtherTeam 16i/32 support
 CONFIG_ETH16I
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6739,8 +7008,8 @@ TI ThunderLAN support (EXPERIMENTAL)
 CONFIG_TLAN
   If you have a PCI Ethernet network card based on the ThunderLAN chip
   which is supported by this driver, say Y and read the
-  Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   Devices currently supported by this driver are Compaq Netelligent,
   Compaq NetFlex and Olicom cards. Please read the file
@@ -6768,8 +7037,8 @@ CONFIG_VIA_RHINE
 Racal-Interlan EISA ES3210 support
 CONFIG_ES3210
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6781,8 +7050,7 @@ SMC EtherPower II (EXPERIMENTAL)
 CONFIG_EPIC100
   If you have an SMC EtherPower II 9432 PCI Ethernet network card
   which is based on the SMC83c170, say Y and read the Ethernet-HOWTO,
-  available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6800,15 +7068,27 @@ CONFIG_ZNET
   The Zenith Z-Note notebook computer has a built-in network
   (Ethernet) card, and this is the Linux driver for it. Note that the
   IBM Thinkpad 300 is compatible with the Z-Note and is also supported
-  by this driver. Read the Ethernet-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  by this driver. Read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
+
+Adaptec Starfire support
+CONFIG_ADAPTEC_STARFIRE
+  If you have an Ethernet network card like this, say Y and read the
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called starfire.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt as well as
+  Documentation/networking/net-modules.txt.
 
 Pocket and portable adapters
 CONFIG_NET_POCKET
   Cute little network (Ethernet) devices which attach to the parallel
   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 ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  one of those, say Y and read the Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to plug a network (or some other) card into the PCMCIA
   (or PC-card) slot of your laptop instead (PCMCIA is the standard for
@@ -6817,9 +7097,7 @@ CONFIG_NET_POCKET
   Documentation/Changes) and you can say N here.
 
   Laptop users should read the Linux Laptop home page at
-  http://www.cs.utexas.edu/users/kharker/linux-laptop/ (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape). 
+  http://www.cs.utexas.edu/users/kharker/linux-laptop/ .
 
   Note that the answer to this question doesn't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -6830,20 +7108,20 @@ AT-LAN-TEC/RealTek pocket adapter support
 CONFIG_ATP
   This is a network (Ethernet) device which attaches to your parallel
   port. Read drivers/net/atp.c as well as the Ethernet-HOWTO,
-  available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO if you want to use this.
-  If you intend to use this driver, you should have said N to the
-  Parallel Printer support, because the two drivers don't like each
-  other.
+  available from http://metalab.unc.edu/mdw/linux.html#howto , if you
+  want to use this. If you intend to use this driver, you should have
+  said N to the Parallel Printer support, because the two drivers
+  don't like each other.
 
 D-Link DE600 pocket adapter support
 CONFIG_DE600
   This is a network (Ethernet) device which attaches to your parallel
   port. Read Documentation/networking/DLINK.txt as well as the
-  Ethernet-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO if you want to use this.
-  It is possible to have several devices share a single parallel port
-  and it is safe to compile the corresponding drivers into the kernel.
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , if you want to use
+  this. It is possible to have several devices share a single parallel
+  port and it is safe to compile the corresponding drivers into the
+  kernel.
 
   If you want to compile this driver as a module however ( = code
   which can be inserted in and removed from the running kernel
@@ -6854,10 +7132,11 @@ D-Link DE620 pocket adapter support
 CONFIG_DE620
   This is a network (Ethernet) device which attaches to your parallel
   port. Read Documentation/networking/DLINK.txt as well as the
-  Ethernet-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO if you want to use this.
-  It is possible to have several devices share a single parallel port
-  and it is safe to compile the corresponding drivers into the kernel.
+  Ethernet-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , if you want to use
+  this. It is possible to have several devices share a single parallel
+  port and it is safe to compile the corresponding drivers into the
+  kernel.
 
   If you want to compile this driver as a module however ( = code
   which can be inserted in and removed from the running kernel
@@ -6872,16 +7151,14 @@ CONFIG_TR
   connected to such a Token Ring network and want to use your Token
   Ring card under Linux, say Y here and to the driver for your
   particular card below and read the Token-Ring mini-HOWTO, available
-  via FTP (user:anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Most people can say N
-  here.
+  from http://metalab.unc.edu/mdw/linux.html#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 and read the Token-Ring mini-HOWTO,
-  available via FTP (user:anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
 
   Warning: this driver will almost definitely fail if more than one
   active Token Ring card is present. 
@@ -6897,16 +7174,16 @@ CONFIG_IBMOL
   Specifically this is all IBM PCI, PCI Wake On Lan, PCI II, PCI II
   Wake On Lan, and PCI 100/16/4 adapters.
 
-  If you have such an adapter, say Y and read the Token-Ring mini-HOWTO,
-  available via FTP (user:anonymous) from
-  ftp://metalab.unc/edu/pub/Linux/docs/HOWTO.
+  If you have such an adapter, say Y and read the Token-Ring
+  mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will will be called olympic.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
+  The module will will be called olympic.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
-  Also read the linux/Documentation/networking/olympic.txt or check the 
+  Also read the file Documentation/networking/olympic.txt or check the 
   Linux Token Ring Project site for the latest information at
   http://www.linuxtr.net
 
@@ -6917,21 +7194,28 @@ CONFIG_SKTR
   (SK-4590), SysKonnect TR4/16 PCI (SK-4591) adapters.
 
   If you have such an adapter and would like to use it, say Y or M and
-  read the Token-Ring mini-HOWTO, available via FTP (user: anonymous)
-  from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  read the Token-Ring mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   Also read the file linux/Documentation/networking/sktr.txt or check
   the Linux-SNA WWW site for the latest information at
-  http://samba.anu.edu.au/linux-sna/documents/drivers/SysKonnect/
+  http://www.linux-sna.org .
 
 Traffic Shaper (EXPERIMENTAL)
 CONFIG_SHAPER
   The traffic shaper is a virtual network device that allows you to
-  limit the rate of outgoing data flow over some other network
-  device. See Documentation/networking/shaper.txt for more
-  information. To set up and configure shaper devices, you need the
-  shapecfg program, available via FTP (user: anonymous) from
-  ftp://shadow.cabi.net/pub/Linux in the shaper package. 
+  limit the rate of outgoing data flow over some other network device.
+  The traffic that you want to slow down can then be routed through
+  these virtual devices. See Documentation/networking/shaper.txt for
+  more information.
+
+  An alternative to this traffic shaper is the experimental
+  Class-Based Queueing (CBQ) scheduling support which you get if you
+  say Y to "QoS and/or fair queueing" above.
+
+  To set up and configure shaper devices, you need the shapecfg
+  program, available from ftp://shadow.cabi.net/pub/Linux in the
+  shaper package.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6964,16 +7248,6 @@ CONFIG_HIPPI
   under Linux, say Y here (you must also remember to enable the driver
   for your HIPPI card below). Most people will say N here.
   
-CERN HIPPI PCI adapter support
-CONFIG_CERN_HIPPI
-  Say Y here if this is your PCI HIPPI network card.
-
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called cern_hippi.o. If you want to compile it as
-  a module, say M here and read Documentation/modules.txt. If unsure,
-  say N.
-
 Essential RoadRunner HIPPI PCI adapter support
 CONFIG_ROADRUNNER
   Say Y here if this is your PCI HIPPI network card.
@@ -7015,8 +7289,8 @@ CONFIG_ARM_AM79C961A
 Support CDROM drives that are not SCSI or IDE/ATAPI
 CONFIG_CD_NO_IDESCSI
   If you have a CDROM drive that is neither SCSI nor IDE/ATAPI, say Y
-  here, otherwise N. Read the CDROM-HOWTO, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  here, otherwise N. Read the CDROM-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#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
@@ -7074,9 +7348,6 @@ CONFIG_MCD
   (PhotoCDs). There is a new driver (next question) which can do
   this. If you want that one, say N here.
 
-  If the driver doesn't work out of the box, you might want to have a
-  look at drivers/cdrom/mcd.h. 
-
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
@@ -7285,17 +7556,248 @@ CONFIG_QUOTA
   If you say Y here, you will be able to set per user limits for disk
   usage (also called disk quotas). Currently, it works only for the
   ext2 filesystem. You need additional software in order to use quota
-  support; for details, read the Quota mini-HOWTO, available via FTP
-  (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini. Probably the quota
+  support; for details, read the Quota mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . Probably the quota
   support is only useful for multi user systems. If unsure, say N.
 
-Acorn's ADFS filesystem support (read only) (EXPERIMENTAL)
-CONFIG_ADFS_FS
-  The Advanced Disk File System is the filesystem used on floppy and
-  hard disks by Acorn Systems.  Currently in development, as a read-
-  only driver for hard disks.  These should be the first partition
-  (eg. /dev/[sh]d?1) on each of your drives.  If unsure, say N.
+Support for USB (EXPERIMENTAL!)
+CONFIG_USB
+  Universal Serial Bus (USB) is a specification for a serial bus
+  system which offers higher speeds and more features than the
+  traditional PC serial port. The bus supplies power to peripherals
+  and allows for hot swapping. Up to 127 USB peripherals can be
+  connected to a single USB port in a tree structure; the USB port is
+  the root of the tree, the peripherals are the leafs and the inner
+  nodes are special USB devices called hubs. Many newer PC's have USB
+  ports and newer peripherals such as scanners, keyboards, mice,
+  modems and printers support the USB protocol and can be connected to
+  the PC via those ports.
+
+  Say Y here if your computer has a USB port and you want to
+  experiment with USB devices. You then need to say Y to at least one
+  of "UHCI support" or "OHCI support" below (the type of interface
+  that the USB hardware in your computer provides) and then choose
+  from among the drivers for USB peripherals.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usbcore.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+UHCI (intel PIIX4 and others) support?
+CONFIG_USB_UHCI
+  The Universal Host Controller Interface is a standard by Intel for
+  accessing the USB hardware in the PC (which is also called the USB
+  host controller). If your USB host controller conforms to this
+  standard, say Y. All recent boards with Intel PCI chipsets conform
+  to this standard. If unsure, say Y.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usb-uhci.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+  
+OHCI (compaq and some others) support?
+CONFIG_USB_OHCI
+  The Open Host Controller Interface is a standard by Compaq for
+  accessing the USB PC hardware (also called USB host controller). If
+  your USB host controller conforms to this standard, say Y. The USB
+  host controllers on most non-Intel architectures and on several x86
+  compatibles with non-Intel chipsets conform to this standard.
+
+  There are currently two OHCI drivers in development. You should
+  compile at most one. The other one is "OHCI-HCD (other OHCI opt.
+  Virt. Root Hub) support?", below.
+
+  You may want to read the file drivers/usb/README.ohci.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usb-ohci.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+Enable tons of OHCI debugging output
+CONFIG_USB_OHCI_DEBUG
+  Say Y here in order to have the OHCI code generate verbose debugging
+  output.
+
+OHCI-HCD (other OHCI opt. Virt. Root Hub) support?
+CONFIG_USB_OHCI_HCD
+  This is an alternative driver for USB PC hardware (also called USB
+  host controller) which complies with Compaq's Open Host Controller
+  Interface. You may want to read the file
+  drivers/usb/README.ohci_hcd.
+
+  There are currently two OHCI drivers in development. You should
+  compile at most one. The other one is "OHCI (compaq and some others)
+  support?", above.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usb-ohci-hcd.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
+
+OHCI-HCD Virtual Root Hub
+CONFIG_USB_OHCI_VROOTHUB
+  The virtual root hub support is currently unstable, so you probably
+  want to say N unless you are a hacker. But you aren't a hacker since
+  you are reading help texts.
+
+Enable lots of ISOC debugging output
+CONFIG_USB_DEBUG_ISOC
+  Say Y here if you want to get lots of debugging output related to
+  the USB code.
+
+USB hub support
+CONFIG_USB_HUB
+  Say Y here if you want to connect several USB devices to a single
+  USB port. You will need an USB hub to do this.
+    
+  If unsure, say Y.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called hub.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+USB mouse support
+CONFIG_USB_MOUSE
+  Say Y here if you want to connect a USB mouse to your computer's USB
+  port.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called mouse.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+USB HP scanner support
+CONFIG_USB_HP_SCANNER
+  Say Y here if you want to connect a USB HP scanner to your
+  computer's USB port. Please read drivers/usb/README.hp_scanner
+  for more information.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called hp_scanner.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+
+USB keyboard support
+CONFIG_USB_KBD
+  Say Y here if you want to connect a USB keyboard to your computer's
+  USB port.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usb-keyboard.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
+
+USB audio parsing support
+CONFIG_USB_AUDIO
+  Say Y here if you want to connect audio equipment such as USB
+  speakers to your computer's USB port.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called audio.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+USB Communications Device Class (ACM) support (Preliminary)
+CONFIG_USB_ACM
+  This driver allows for devices which support the Abstract Control
+  Model, including many USB-based modems, ISDN adapters, and network
+  adapters.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called acm.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+USB Printer support
+CONFIG_USB_PRINTER
+  Say Y here if you want to connect a printer to your computer's USB
+  port.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called printer.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+USB CPiA Camera support
+CONFIG_USB_CPIA
+  Say Y here if you want to connect this type of camera to your
+  computer's USB port.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called cpia.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+USB SCSI Support
+CONFIG_USB_SCSI
+  Say Y here if you want to connect SCSI devices to your computer's
+  USB port.
+
+USB SCSI verbose debug
+CONFIG_USB_SCSI_DEBUG
+  Say Y here in order to have the USB SCSI code generate verbose
+  debugging messages.
+
+#EZUSB Firmware downloader
+#CONFIG_USB_EZUSB
+
+USS720 parport driver
+CONFIG_USB_USS720
+  This driver is for USB parallel port adapters that use the Lucent
+  Technologies USS-720 chip. These adapters provide USB compatibility
+  to peripherals designed with parallel port interfaces.
+  
+  The chip has two modes: automatic mode and manual mode. In automatic
+  mode, it looks to the computer like a standard USB printer. Only
+  printers may be connected to the USS-720 in this mode. The generic
+  USB printer driver ("USB Printer support", above) may be used in
+  that mode, and you can say N here if you want to use the chip only
+  in this mode.
+
+  Manual mode is not limited to printers, any parallel port
+  device should work. This driver utilizes manual mode.
+  Note however that some operations are three orders of a magnitude
+  slower than on a PCI/ISA Parallel Port, so timing critical
+  applications might not work.
+
+  Say Y here if you own an USS-720 USB->Parport cable and intend to
+  connect anything other than a printer to it.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called uss720.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+  
+USB /proc filesystem entry support (Preliminary)
+CONFIG_USB_PROC
+  This reports USB drivers and devices in the /proc filesystem.
+  Entries are located in /proc/bus/usb. The entries are described in
+  the file Documentation/proc_usb_info.txt.
+
+  Note that you must say Y to "/proc filesystem support" below for
+  this to work.
+
+Generic ACPI support
+CONFIG_ACPI
+  Advanced Configuration and Power Interface (ACPI) is an interface
+  specification to support power management of peripherals. If your
+  system supports it, say Y here.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called acpi.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+  
+PIIX4 ACPI support
+CONFIG_PIIX4_ACPI
+  If you have a PIIX4 based motherboard (PCI ISA IDE Xcelerator
+  (PIIX4) is a multi-function PCI device) and you want support for
+  Advanced Configuration and Power Interface (ACPI) to support power
+  management of peripherals, say Y here.
 
 Minix fs support
 CONFIG_MINIX_FS
@@ -7334,10 +7836,9 @@ CONFIG_EXT2_FS
   filesystem support" below). Saying Y here will enlarge your kernel
   by about 44 kB.
 
-  The Ext2fs-Undeletion mini-HOWTO, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini,
-  gives information about how to retrieve deleted files on ext2fs
-  filesystems.
+  The Ext2fs-Undeletion mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , gives information about
+  how to retrieve deleted files on ext2fs filesystems.
 
   To change the behavior of ext2 filesystems, you can use the tune2fs
   utility ("man tune2fs"). To modify attributes of files and
@@ -7345,12 +7846,12 @@ CONFIG_EXT2_FS
   
   Ext2fs partitions can be read from within DOS using the ext2tool
   command line tool package (available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2) and from
+  ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2 ) and from
   within Windows NT using the ext2nt command line tool package from
-  ftp://metalab.unc.edu/pub/Linux/utils/dos. Explore2fs is a graphical
+  ftp://metalab.unc.edu/pub/Linux/utils/dos . Explore2fs is a graphical
   explorer for ext2fs partitions which runs on Windows 95 and Windows
   NT and includes experimental write support; it is available from
-  http://jnewbigin-pc.it.swin.edu.au/Linux/Explore2fs.htm.
+  http://jnewbigin-pc.it.swin.edu.au/Linux/Explore2fs.htm .
 
   If you want to compile this filesystem as a module ( = code which
   can be inserted in and removed from the running kernel whenever you
@@ -7369,9 +7870,8 @@ CONFIG_ISO9660_FS
   If you have a CDROM drive and want to do more with it than just
   listen to audio CDs and watch its LEDs, say Y (and read
   Documentation/filesystems/isofs.txt and the CDROM-HOWTO, available
-  via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO), thereby enlarging your
-  kernel by about 27 kB; otherwise say N.
+  from http://metalab.unc.edu/mdw/linux.html#howto ), thereby
+  enlarging your kernel by about 27 kB; otherwise say N.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7384,16 +7884,15 @@ CONFIG_JOLIET
   which allows for long filenames in unicode format (unicode is the
   new 16 bit character code, successor to ASCII, which encodes the
   characters of almost all languages of the world; see
-  http://www.unicode.org for more information; to browse the WWW, you
-  need to have access to a machine on the Internet that has a program
-  like lynx or netscape). Say Y here if you want to be able to read
-  Joliet CDROMs under Linux.
+  http://www.unicode.org for more information). Say Y here if you want
+  to be able to read Joliet CDROMs under Linux.
 
 UDF Filesystem support
 CONFIG_UDF_FS
-  This is the new filesystem used by some CDROMS and DVD drivers. 
-  Say Y if you intend to mount DVD discs or CDRWs written in packet mode,
-  or if written to by other UDF utilities, such as DirectCD.
+  This is the new filesystem used by some CDROMS and DVD drivers. Say
+  Y if you intend to mount DVD discs or CDRW's written in packet mode,
+  or if written to by other UDF utilities, such as DirectCD. Please
+  read Documentation/filesystems/udf.txt.
 
   This filesystem support is also available as a module ( = code which
   can be inserted in and removed from the running kernel whenever you
@@ -7449,9 +7948,9 @@ CONFIG_MSDOS_FS
   This allows you to mount MSDOS partitions of your hard drive (unless
   they are compressed; to access compressed MSDOS partitions under
   Linux, you can either use the DOS emulator DOSEMU, described in the
-  DOSEMU-HOWTO, available via FTP (user: anonymous) at
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO, or try dmsdosfs in
-  ftp://metalab.unc.edu/pub/Linux/system/filesystems/dosfs. If you
+  DOSEMU-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , or try dmsdosfs in
+  ftp://metalab.unc.edu/pub/Linux/system/filesystems/dosfs . If you
   intend to use dosemu with a non-compressed MSDOS partition, say Y
   here) and MSDOS floppies. This means that file access becomes
   transparent, i.e. the MSDOS files look and behave just like all
@@ -7533,11 +8032,8 @@ CONFIG_PROC_FS
   to use the same IRQ). 
 
   The /proc filesystem is explained in the file
-  Documentation/proc.txt, 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").
+  Documentation/filesystems/proc.txt and on the proc(5) manpage ("man
+  5 proc").
 
   This option will enlarge your kernel by about 67 KB. Several
   programs depend on this, so everyone should say Y here.
@@ -7552,8 +8048,8 @@ CONFIG_NFS_FS
   client's hard disk. For this to work, the server must run the
   programs nfsd and mountd (but does not need to have NFS filesystem
   support enabled in its kernel). NFS is explained in the Network
-  Administrator's Guide, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/LDP, on its man page: "man
+  Administrator's Guide, available from
+  http://metalab.unc.edu/mdw/linux.html#guide , on its man page: "man
   nfs", and in the NFS-HOWTO.
   
   A superior but less widely used alternative to NFS is provided by
@@ -7603,8 +8099,8 @@ CONFIG_NFSD
   locations are given in the file Documentation/Changes in the NFS
   section.
 
-  Please read the NFS-HOWTO, available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  Please read the NFS-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   The NFS server is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7615,26 +8111,16 @@ Emulate Sun NFS daemon
 CONFIG_NFSD_SUN
   If you would like for the server to allow clients to access
   directories that are mount points on the local filesystem (this is
-  how nfsd behaves on Sun systems), say yes here. If unsure, say N.
+  how nfsd behaves on Sun systems), say Y here. If unsure, say N.
 
-OS/2 HPFS filesystem support (read/write)
+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 hard disk
-  partitions. Say Y if you want to be able to read and write files
-  on an OS/2 HPFS partition of your hard drive. OS/2 floppies however
-  are in regular MSDOS format, so you don't need this option in order
-  to be able to read them. Read Documentation/filesystems/hpfs.txt. 
-  
-  Write support is new and experimental. I don't think it's so
-  "experimental" that it corrupts disks. (but you know: "There's no
-  warranty") There are many checks and filesystem is remounted read-only
-  if any inconsistency found. I use it quite long time and it works.
-
-  This driver may not be able to write to HPFS386 disks on Warp server.
-  HPFS386 on Warp client seems to work ok. If some unknown HPFS386
-  structures are deteced, they are not destroyed and filesystem is
-  remounted read-only.
+  partitions. Say Y if you want to be able to read files from an OS/2
+  HPFS partition of your hard drive. OS/2 floppies however are in
+  regular MSDOS format, so you don't need this option in order to be
+  able to read them. Read Documentation/filesystems/hpfs.txt. 
 
   This filesystem is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7654,7 +8140,7 @@ CONFIG_NTFS_FS
   The module will be called ntfs.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-NTFS read-write support (experimental)
+NTFS read-write support (EXPERIMENTAL)
 CONFIG_NTFS_RW
   If you say Y here, you will (hopefully) be able to write to NTFS
   file systems as well as read from them. The read-write support
@@ -7677,7 +8163,7 @@ CONFIG_SYSV_FS
   Xenix, Wyse, UnixWare, Dell Unix and System V programs under Linux
   and is often needed to run commercial software that's only available
   for those systems. It's available via FTP (user: anonymous) from
-  ftp://tsx-11.mit.edu/pub/linux/BETA).
+  ftp://tsx-11.mit.edu/pub/linux/BETA ).
 
   If you only intend to mount files from some other Unix over the
   network using NFS, you don't need the System V filesystem support
@@ -7710,18 +8196,16 @@ CONFIG_AFFS_FS
   fs/affs/Changes. 
 
   With this driver you can also mount disk files used by Bernd
-  Schmidt's Un*X Amiga Emulator (http://www.freiburg.linux.de/~uae/;
-  to browse the WWW, you need to have access to a machine on the
-  Internet that has a program like lynx or netscape). If you want to
-  do this, you will also need to say Y or M to "Loop device support",
-  above.
+  Schmidt's Un*X Amiga Emulator (http://www.freiburg.linux.de/~uae/ ).
+  If you want to do this, you will also need to say Y or M to "Loop
+  device support", above.
 
   This filesystem is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module is called affs.o. If you want to compile it as a module,
   say M here and read Documentation/modules.txt. If unsure, say N.
 
-Apple Macintosh filesystem support (experimental)
+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.
@@ -7774,7 +8258,7 @@ CONFIG_AUTOFS_FS
   automounter (amd), which is a pure user space daemon.
 
   To use the automounter you need the user-space tools from
-  ftp://ftp.kernel.org/pub/linux/daemons/autofs; you also want to
+  ftp://ftp.kernel.org/pub/linux/daemons/autofs ; you also want to
   answer Y to "NFS filesystem support", below.
 
   If you want to compile this as a module ( = code which can be
@@ -7785,6 +8269,26 @@ CONFIG_AUTOFS_FS
   If you are not a part of a fairly large, distributed network, you
   probably do not need an automounter, and can say N here.
 
+EFS filesystem support (EXPERIMENTAL)
+CONFIG_EFS_FS
+  EFS is an older filesystem used for non-ISO9660 CDROMs and hard disk
+  partitions by SGI's IRIX operating system (IRIX 6.0 and newer uses
+  the XFS filesystem for hard disk partitions however).
+
+  This implementation only offers read-only access. If you don't know
+  what all this is about, it's safe to say N. For more information
+  about EFS see its home page at http://aeschi.ch.eu.org/efs/ .
+
+  If you want to compile the EFS filesystem 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 efs.o. 
+
+SGI disklabel support
+CONFIG_SGI_DISKLABEL
+  Say Y to this only if you plan on mounting disks with SGI
+  disklabels. This is not required to mount EFS-format CDROMs.
+
 UFS filesystem support
 CONFIG_UFS_FS
   BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
@@ -7815,34 +8319,35 @@ CONFIG_UFS_FS
 
   If you haven't heard about all of this before, it's safe to say N.
 
-UFS filesystem write support (experimental)
+UFS filesystem write support (EXPERIMENTAL)
 CONFIG_UFS_FS_WRITE
   Say Y here if you want to try writing to UFS partitions. This is
   experimental, so you should back up your UFS partitions beforehand.
 
-EFS filesystem support (experimental)
-CONFIG_EFS_FS
-  EFS is the filesystem used for CDROMs and filesystems by SGI's IRIX.
-  This implementation only offers read-only access. If you don't know
-  what all this is about, it's safe to say N. For more information
-  about EFS see its homepage at http://aeschi.ch.eu.org/efs/.
+Advanced partition selection
+CONFIG_PARTITION_ADVANCED
+  Say Y here if you would like to use hard disks under Linux which
+  were partitioned under an operating system running on a different
+  architecture than your Linux system.
 
-SGI disklabel support
-CONFIG_SGI_DISKLABEL
-  Say Y to this only if you plan on mounting disks with SGI disklabels.
-  This is not required to mount EFS-format CDROMs.
+  Note that the answer to this question won't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions about foreign partitioning schemes. If unsure, say N.
 
-EFS filesystem support (experimental)
-CONFIG_EFS_FS
-  EFS is the filesystem used for CDROMs and filesystems by SGI's IRIX.
-  This implementation only offers read-only access.  If you don't know
-  what all this is about, it's safe to say N.  For more information
-  about EFS see it's homepage at http://aeschi.ch.eu.org/efs.
+Alpha OSF partition support
+CONFIG_OSF_PARTITION
+  Say Y here if you would like to use hard disks under Linux which
+  were partitioned on an Alpha machine.
 
-SGI disklabel support
-CONFIG_SGI_DISKLABEL
-  Say Y to this only if you plan on mounting disks with SGI disklabels.
-  This is not required to mount EFS-format CDROMs.
+Macintosh partition map support
+CONFIG_MAC_PARTITION
+  Say Y here if you would like to use hard disks under Linux which
+  were partitioned on a Macintosh.
+
+PC BIOS (MSDOS partition tables) support
+CONFIG_MSDOS_PARTITION
+  Say Y here if you would like to use hard disks under Linux which
+  were partitioned on an x86 PC (not necessarily by DOS).
 
 BSD disklabel (FreeBSD partition tables) support
 CONFIG_BSD_DISKLABEL
@@ -7855,11 +8360,11 @@ CONFIG_BSD_DISKLABEL
   filesystem support", above. If you don't know what all this is
   about, say N.
 
-SMD disklabel (Sun partition tables) support
-CONFIG_SMD_DISKLABEL
+Sun partition tables support
+CONFIG_SUN_PARTITION
   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 from
+  read these partition tables and further mount SunOS partitions from
   within Linux if you have also said Y to "UFS filesystem support",
   above. This is mainly used to carry data from a SPARC under SunOS to
   your Linux box via a removable medium like magneto-optical or ZIP
@@ -7872,9 +8377,14 @@ Solaris (x86) partition table support
 CONFIG_SOLARIS_X86_PARTITION
   Like most systems, Solaris x86 uses its own hard disk partition
   table format, incompatible with all others. Saying Y here allows you
-  to read these partition tables and further mount Solaris x86 disks
-  from within Linux if you have also said Y to "UFS filesystem
-  support", above.
+  to read these partition tables and further mount Solaris x86
+  partitions from within Linux if you have also said Y to "UFS
+  filesystem support", above.
+
+SGI partition support
+CONFIG_SGI_PARTITION
+  Say Y here if you would like to be able to read the hard disk
+  partition table format used by SGI machines.
 
 ADFS filesystem support (read only) (EXPERIMENTAL)
 CONFIG_ADFS_FS
@@ -7885,7 +8395,8 @@ CONFIG_ADFS_FS
   and from ADFS-formatted floppy discs.
 
   The ADFS partition should be the first partition (i.e.,
-  /dev/[hs]d?1) on each of your drives.
+  /dev/[hs]d?1) on each of your drives. Please read the file
+  Documentation/filesystems/adfs.txt for further details.
 
   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
@@ -7928,12 +8439,6 @@ CONFIG_UNIXWARE_DISKLABEL
 
   If you don't know what all this is about, say N.
 
-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.
-
 SMB filesystem support (to mount Windows shares etc...)
 CONFIG_SMB_FS
   SMB (Server Message Block) is the protocol Windows for Workgroups
@@ -7943,20 +8448,17 @@ CONFIG_SMB_FS
   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 and the SMB-HOWTO, available via
-  FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  Documentation/filesystems/smbfs.txt and the SMB-HOWTO, available
+  from http://metalab.unc.edu/mdw/linux.html#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
-  ftp://metalab.unc.edu/pub/Linux/system/network/samba) for that.
+  ftp://metalab.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://www.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). 
+  Macs is on the WWW at http://www.eats.com/linux_mac_win.html .
 
   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
@@ -7977,9 +8479,7 @@ CONFIG_CODA_FS
   *client*. You will need user level code as well, both for the client
   and server. Servers are currently user level, i.e. need no kernel
   support. Please read Documentation/filesystems/coda.txt and check
-  out the Coda home page http://www.coda.cs.cmu.edu (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape).
+  out the Coda home page http://www.coda.cs.cmu.edu .
 
   If you want to compile the coda client support as a module ( = code
   which can be inserted in and removed from the running kernel
@@ -7994,15 +8494,13 @@ CONFIG_NCP_FS
   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
-  IPX-HOWTO on ftp://metalab.unc.edu/pub/Linux/docs/howto.
+  IPX-HOWTO from http://metalab.unc.edu/mdw/linux.html#howto .
 
   You do not have to say Y here if you want your Linux box to act as a
   file *server* for Novell NetWare clients.
 
   General information about how to connect Linux, Windows machines and
-  Macs is on the WWW at http://www.eats.com/linux_mac_win.html (to
-  browse the WWW, you need to have access to a machine on the Internet
-  that has a program like lynx or netscape). 
+  Macs is on the WWW at http://www.eats.com/linux_mac_win.html .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -8365,7 +8863,7 @@ CONFIG_NLS_ISO8859_10
   letters that were missing in Latin 4 to cover the entire Nordic
   area.
 
-nls iso8859-14
+NLS ISO 8859-14 (Latin 8; Celtic)
 CONFIG_NLS_ISO8859_14
   If you want to display filenames with native language characters
   from the Microsoft fat filesystem family or from JOLIET CDROMs
@@ -8437,9 +8935,8 @@ CONFIG_VT_CONSOLE
   would use the third virtual terminal as system console. (Try "man
   bootparam" or see the documentation of your boot loader (lilo or
   loadlin) about how to pass options to the kernel at boot time. The
-  lilo procedure is also explained in the SCSI-HOWTO, available via
-  FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.)
+  lilo procedure is also explained in the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
 
   If unsure, say Y.
 
@@ -8481,9 +8978,9 @@ CONFIG_SERIAL
   BTW1: If you have a mouseman serial mouse which is not recognized by
   the X window system, try running gpm first. 
   
-  BTW2: If you intend to connect a so-called Winmodem to your
-  machine's serial port, forget it. These modems are crippled and
-  require proprietary drivers which are only available under Windows.
+  BTW2: If you intend to use a software modem (also called Winmodem)
+  under Linux, forget it. These modems are crippled and require
+  proprietary drivers which are only available under Windows.
 
   Most people will say Y or M here, so that they can use serial mice,
   modems and similar devices connecting to the standard serial ports.
@@ -8502,8 +8999,8 @@ CONFIG_SERIAL_CONSOLE
   "console=ttyS1". (Try "man bootparam" or see the documentation of
   your boot loader (lilo or loadlin) about how to pass options to the
   kernel at boot time. The lilo procedure is also explained in the
-  SCSI-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.) 
+  SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
 
   If you don't have a VGA card installed and you say Y here, the
   kernel will automatically use the first serial line, /dev/ttyS0, as
@@ -8566,6 +9063,21 @@ CONFIG_RISCOM8
   Also it's possible to say M here and compile this driver as kernel
   loadable module; the module will be called riscom8.o.
 
+Computone IntelliPort Plus serial support
+CONFIG_COMPUTONE
+  This driver supports the entire family of Intelliport II/Plus
+  controllers with the exception of the MicroChannel controllers. It
+  does not support products previous to the Intelliport II. These are
+  multiport cards, which give you many serial ports. You would need
+  something like this to connect more than two modems to your Linux
+  box, for instance in order to become a dial-in server. If you have a
+  card like that, say Y here and read Documentation/computone.txt.
+
+  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. You will get two
+  modules called ip2.o and ip2main.o.
+
 Specialix IO8+ card support
 CONFIG_SPECIALIX
   This is a driver for the Specialix IO8+ multiport card (both the
@@ -8659,15 +9171,23 @@ CONFIG_SYNCLINK
 
 Synchronous HDLC line discipline support
 CONFIG_N_HDLC
-  Allows synchronous HDLC communications with
-  tty device drivers that support synchronous
-  HDLC such as the Microgate SyncLink adapter.
+  Allows synchronous HDLC communications with tty device drivers that
+  support synchronous HDLC such as the Microgate SyncLink adapter.
 
   This driver can only be built as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called n_hdlc.o. If you want to do that, say M
   here.
 
+Specialix SX (and SI) card support
+CONFIG_SX
+  This is a driver for the SX and SI multiport serial cards.
+  Please read the file Documentation/sx.txt for details.
+
+  This driver can only be built as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called sx.o. If you want to do that, say M here.
+
 Hayes ESP serial port support
 CONFIG_ESPSERIAL
   This is a driver which supports Hayes ESP serial ports. Both single
@@ -8730,25 +9250,24 @@ CONFIG_PRINTER
   If you intend to attach a printer to the parallel port of your Linux
   box (as opposed to using a serial printer; if the connector at the
   printer has 9 or 25 holes ["female"], then it's serial), say Y. Also
-  read the Printing-HOWTO, available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  read the Printing-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   It is possible to share one parallel port among several devices
   (e.g. printer and ZIP drive) and it is safe to compile the
   corresponding drivers into the kernel. If you want to compile this
   driver as a module however ( = code which can be inserted in and
   removed from the running kernel whenever you want), say M here and
-  read Documentation/modules.txt and Documentation/parport.txt. The
+  read Documentation/modules.txt and Documentation/parport.txt. The 
   module will be called lp.o. 
 
   If you have several parallel ports, you can specify which ports to
   use with the "lp" kernel command line option. (Try "man bootparam"
-  or see the documentation of your boot loader (lilo or loadlin)
-  about how to pass options to the kernel at boot time. The lilo
-  procedure is also explained in the SCSI-HOWTO, available via FTP
-  (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.)
-  The syntax of the "lp" command line option can be found in
-  drivers/char/lp.c.
+  or see the documentation of your boot loader (lilo or loadlin) about
+  how to pass options to the kernel at boot time. The lilo procedure
+  is also explained in the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .) 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.
@@ -8766,15 +9285,38 @@ CONFIG_LP_CONSOLE
 
   If unsure, say N.
 
-Mouse Support (not serial mice)
-CONFIG_MOUSE
-  This is for machines with a bus mouse or a PS/2 mouse as opposed to
-  a serial mouse. Most people have a regular serial MouseSystem or
+Bus Mouse Support
+CONFIG_BUSMOUSE
+  Say Y here if your machine has a bus mouse as opposed to a serial
+  mouse. Most people have a regular serial MouseSystem or
   Microsoft mouse (made by Logitech) that plugs into a COM port
   (rectangular with 9 or 25 pins). These people say N here. If you
-  have something else, read the Busmouse-HOWTO, available via FTP
-  (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO and
-  say Y here.
+  have something else, read the Busmouse-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto , and say Y here.
+
+  If you have a laptop, you either have to check the documentation or
+  experiment a bit to find out whether the trackball is a serial mouse
+  or not; it's best to say Y here for you. 
+
+  This is the generic bus mouse driver code. If you have a bus mouse,
+  you will have to say Y here and also to the specific driver for your
+  mouse below.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called busmouse.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+Mouse Support (not serial and bus mice)
+CONFIG_MOUSE
+  This is for machines with a mouse which is neither a serial nor a
+  bus mouse. Examples are PS/2 mice (such as the track balls on some
+  laptops) and some digitizer pads. Most people have a regular serial
+  MouseSystem or Microsoft mouse (made by Logitech) that plugs into a
+  COM port (rectangular with 9 or 25 pins). These people say N here.
+  If you have something else, read the Busmouse-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . This HOWTO contains
+  information about all non-serial mice, not just bus mice.
 
   If you have a laptop, you either have to check the documentation or
   experiment a bit to find out whether the trackball is a serial mouse
@@ -8785,13 +9327,12 @@ CONFIG_MOUSE
   the questions about non-serial mice. If unsure, say Y.
 
 Logitech busmouse support
-CONFIG_BUSMOUSE
+CONFIG_LOGIBUSMOUSE
   Logitech mouse connected to a proprietary interface card. It's
   generally a round connector with 9 pins. Note that the newer mice
   made by Logitech don't use the Logitech protocol anymore; for those,
-  you don't need this option. You want to read the Busmouse-HOWTO,
-  available via FTP (user: anonymous) in
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  you don't need this option. You want to read the Busmouse-HOWTO ,
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -8810,29 +9351,27 @@ CONFIG_PSMOUSE
   particular, the C&T 82C710 mouse on TI Travelmates is a PS/2 mouse.
 
   Although PS/2 mice are not technically bus mice, they are explained
-  in detail in the Busmouse-HOWTO, available via FTP (user: anonymous)
-  in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. 
+  in detail in the Busmouse-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   When using a PS/2 mouse, you can get problems if you want to use the
   mouse both on the Linux console and under X. Using the "-R" option
   of the Linux mouse managing program gpm (available from
-  ftp://metalab.unc.edu/pub/Linux/system/Daemons) solves this
-  problem, or you can get the "mconv" utility also from metalab.
+  ftp://metalab.unc.edu/pub/Linux/system/mouse ) solves this
+  problem, or you can get the "mconv2" utility from the same location.
 
 C&T 82C710 mouse port support (as on TI Travelmate)
 CONFIG_82C710_MOUSE
   This is a certain kind of PS/2 mouse used on the TI Travelmate. If
   you are unsure, try first to say N here and come back if the mouse
-  doesn't work. Read the Busmouse-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  doesn't work. Read the Busmouse-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
 PC110 digitizer pad support
 CONFIG_PC110_PAD
   This drives the digitizer pad on the IBM PC110 palmtop (see
-  http://toy.cabi.net; to browse the WWW, you need to have access to a
-  machine on the Internet that has a program like lynx or
-  netscape). It can turn the digitizer pad into a PS/2 mouse emulation
-  with tap gestures or into an absolute pad. 
+  http://toy.cabi.net ). It can turn the digitizer pad into a PS/2
+  mouse emulation with tap gestures or into an absolute pad.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -8843,8 +9382,8 @@ Microsoft busmouse support
 CONFIG_MS_BUSMOUSE
   These animals (also called Inport mice) are connected to an
   expansion board using a round connector with 9 pins. If this is what
-  you have, say Y and read the Busmouse-HOWTO, available via FTP
-  (user: anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  you have, say Y and read the Busmouse-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you are unsure, say N and read the HOWTO nevertheless: it will
   tell you what you have. Also be aware that several vendors talk
@@ -8856,12 +9395,25 @@ CONFIG_MS_BUSMOUSE
   say M here and read Documentation/modules.txt. The module will be
   called msbusmouse.o. 
 
+Apple Desktop Bus mouse support
+CONFIG_ADBMOUSE
+  Say Y here if you have this type of bus mouse (4 pin connector) as
+  is common on Macintoshes. You may want to read the Busmouse-HOWTO,
+  available from http://metalab.unc.edu/mdw/linux.html#howto .
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called adbmouse.o.
+
 ATIXL busmouse support
 CONFIG_ATIXL_BUSMOUSE
   This is a rare type of busmouse that is connected to the back of an
-  ATI video card. Note that most ATI mice are actually Microsoft
-  busmice. Read the Busmouse-HOWTO, available via FTP (user:
-  anonymous) in ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  ATI video card. Say Y if you have one of those. Note however that
+  most mice by ATI are actually Microsoft busmice; you should say Y to
+  "Microsoft busmouse support" above if you have one of those. Read
+  the Busmouse-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -8871,11 +9423,6 @@ CONFIG_ATIXL_BUSMOUSE
   If you are unsure, say N and read the HOWTO nevertheless: it will
   tell you what you have.
 
-Support for PowerMac ADB mouse
-CONFIG_ADBMOUSE
-  If you have an ADB mouse (4 pin connector) as is common on
-  Macintoshes, say Y here.
-
 QIC-02 tape support
 CONFIG_QIC02_TAPE
   If you have a non-SCSI tape drive like that, say Y. Or, if you want
@@ -8925,13 +9472,12 @@ CONFIG_FTAPE
   Note that the Ftape-HOWTO is out of date (sorry) and documents the
   older version 2.08 of this software but still contains useful
   information. There is a web page with more recent documentation at
-  http://www-math.math.rwth-aachen.de/~LBFM/claus/ftape/ . This page
+  http://www.math1.rwth-aachen.de/~heine/ftape/ . This page
   always contains the latest release of the ftape driver and useful
   information (backup software, ftape related patches and
-  documentation, FAQ). (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 file system interface has changed quite a bit compared
-  to previous versions of ftape. Please read Documentation/ftape.txt.
+  documentation, FAQ). Note that the file system interface has changed
+  quite a bit compared to previous versions of ftape. Please read
+  Documentation/ftape.txt.
 
 The file system interface for ftape
 CONFIG_ZFTAPE
@@ -8962,8 +9508,7 @@ CONFIG_ZFTAPE
   most important changes in the file system interface compared to
   previous versions of ftape. The ftape home page
   http://www-math.math.rwth-aachen.de/~LBFM/claus/ftape/ contains
-  further information (to browse the WWW, you need to have access to a
-  machine on the Internet that has a program like lynx or netscape).
+  further information.
 
   IMPORTANT NOTE: zftape can read archives created by previous
   versions of ftape and provide file mark support (i.e. fast skipping
@@ -9185,6 +9730,17 @@ CONFIG_FT_FDC_MAX_RATE
   speed. If unsure, leave this disabled, i.e. leave it at 2000
   bits/sec.
 
+Direct Rendering Manager (XFree86 DRI support)
+CONFIG_DRM
+  Kernel-level support for the Direct Rendering Infrastructure (DRI)
+  introduced in XFree86 4.x. These modules provide support for
+  synchronization, security, and DMA transfers. Select the module that
+  provides support for your graphics card.
+
+3dlabs GMX 2000 Direct Rendering Driver (XFree86 DRI support)
+CONFIG_DRM_GAMMA
+  Choose M here if you have a 3dlabs GMX 2000 graphics card.
+
 MTRR control and configuration
 CONFIG_MTRR
   On Intel P6 family processors (Pentium Pro, Pentium II and later)
@@ -9201,11 +9757,13 @@ CONFIG_MTRR
 
   The Cyrix 6x86, 6x86MX and M II processors have Address Range
   Registers (ARRs) which provide a similar functionality to MTRRs. For
-  these, the ARRs are used to emulate the MTRRs.
+  these, the ARRs are used to emulate the MTRRs, which means that it
+  makes sense to say Y here for these processors as well.
 
   The AMD K6-2 (stepping 8 and above) and K6-3 processors have two
-  MTRRs. These are supported.
-  
+  MTRRs. The Centaur C6 (WinChip) has 8 MCRs, allowing
+  write-combining. All of these processors are supported by this code.
+
   The Centaur C6 (WinChip) has 8 MCRs, allowing write-combining. These
   are supported.
 
@@ -9226,13 +9784,13 @@ CONFIG_FT_ALPHA_CLOCK
 
 Zilog serial support
 CONFIG_SUN_ZS
-  If you are asked this question, something is wrong with config scripts.
-  Zilog serial driver is always enabled in sparc architecture.
+  This driver does not exist at this point, so you might as well 
+  say N.
 
 Double Talk PC internal speech card support
 CONFIG_DTLK
   This driver is for the DoubleTalk PC, a speech synthesizer
-  manufactured by RC Systems (http://www.rcsys.com/).  It is also
+  manufactured by RC Systems (http://www.rcsys.com/ ).  It is also
   called the `internal DoubleTalk'.  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
@@ -9240,7 +9798,7 @@ CONFIG_DTLK
 
 Siemens R3964 serial protocol support
 CONFIG_R3964
-  This driver allows syncronous communication with devices using the
+  This driver allows synchronous communication with devices using the
   Siemens R3964 packet protocol. Unless you are dealing with special
   hardware like PLCs, you are unlikely to need this.
 
@@ -9253,12 +9811,11 @@ CONFIG_R3964
 
 Applicom intelligent fieldbus card support
 CONFIG_APPLICOM
-  This driver provides the kernel-side support for the intelligent 
+  This driver provides the kernel-side support for the intelligent
   fieldbus cards made by Applicom International. More information
   about these cards can be found on the WWW at the address
-  http://www.applicom-int.com/ (to browse the WWW, you need to have
-  access to a machine on the Internet that has a program like lynx
-  or netscape), or by email from David Woodhouse <dwmw2@mvhi.com>.
+  http://www.applicom-int.com/ , or by email from David Woodhouse
+  <dwmw2@mvhi.com>.
 
   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
@@ -9277,8 +9834,8 @@ CONFIG_APM
   receive notification of APM "events" (e.g., battery status change).
 
   Supporting software is available; for more information, read the
-  Battery Powered Linux mini-HOWTO, available via FTP (user:
-  anonymous) from ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini.
+  Battery Powered Linux mini-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .
 
   This driver does not spin down disk drives (see the hdparm(8)
   manpage ("man 8 hdparm") for that), and it doesn't turn off
@@ -9293,9 +9850,7 @@ CONFIG_APM
 
   If you are running Linux on a laptop, you may also want to read the
   Linux Laptop home page on the WWW at
-  http://www.cs.utexas.edu/users/kharker/linux-laptop/ (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape). 
+  http://www.cs.utexas.edu/users/kharker/linux-laptop/ .
 
   Generally, if you don't have a battery in your machine, there isn't
   much point in using this driver and you should say N. If you get
@@ -9322,6 +9877,11 @@ CONFIG_APM
    11) exchange RAM chips 
    12) exchange the motherboard.
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  If you want to compile it as a module, say M here and read
+  Documentation/modules.txt. The module will be called apm.o.
+
 Ignore USER SUSPEND
 CONFIG_APM_IGNORE_USER_SUSPEND
   This option will ignore USER SUSPEND requests. On machines with a
@@ -9372,11 +9932,10 @@ CONFIG_APM_POWER_OFF
   is halted. You will need software (e.g., a suitable version of the
   halt(8) command ("man 8 halt")) to cause the computer to power down.
   Recent versions of the sysvinit package available from
-  ftp://metalab.unc.edu/pub/Linux/system/daemons/init/ (user:
-  anonymous) contain support for this ("halt -p" shuts down Linux and
-  powers off the computer, if executed from runlevel 0). As with the
-  other APM options, this option may not work reliably with some APM
-  BIOS implementations.
+  ftp://metalab.unc.edu/pub/Linux/system/daemons/init/ contain support
+  for this ("halt -p" shuts down Linux and powers off the computer, if
+  executed from runlevel 0). As with the other APM options, this
+  option may not work reliably with some APM BIOS implementations.
 
 Ignore multiple suspend/standby events
 CONFIG_APM_IGNORE_MULTIPLE_SUSPEND
@@ -9432,7 +9991,7 @@ CONFIG_WATCHDOG
 
   The watchdog is usually used together with the watchdog daemon 
   which is available via FTP (user: anonymous) from
-  ftp://tsx-11.mit.edu/pub/linux/sources/sbin/. This daemon can also
+  ftp://tsx-11.mit.edu/pub/linux/sources/sbin/ . This daemon can also
   monitor NFS connections and can reboot the machine when the process
   table is full.
 
@@ -9490,8 +10049,7 @@ CONFIG_PCWATCHDOG
   and if it does, it reboots your computer after a certain amount of
   time. This driver is like the WDT501 driver but for different
   hardware. Please read Documentation/pcwd-watchdog.txt. The PC
-  watchdog cards can be ordered from http://www.berkprod.com. Some
-  example rc.local files are available from ftp://ftp.bitgate.com. 
+  watchdog cards can be ordered from http://www.berkprod.com . 
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -9565,17 +10123,6 @@ CONFIG_NVRAM
   The module will be called nvram.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Atomwide Serial Support
-CONFIG_ATOMWIDE_SERIAL
-  If you have an Atomwide Serial card for an Acorn system, say Y to
-  this option.  The driver can handle 1, 2, or 3 port cards.
-  If unsure, say N
-
-The Serial Port Dual Serial Port
-CONFIG_DUALSP_SERIAL
-  If you have the Serial Port's dual serial card for an Acorn system,
-  say Y to this option.  If unsure, say N
-
 Joystick support
 CONFIG_JOYSTICK
   If you have a joystick, you can say Y here to enable generic
@@ -9681,32 +10228,37 @@ CONFIG_DUALSP_SERIAL
 
 NetWinder Button
 CONFIG_NWBUTTON
-  If you enable this driver and create a character device node
-  /dev/nwbutton with major and minor numbers 10 and 158 ("man mknod"),
-  then every time the orange button is pressed a number of times, the
-  number of times the button was pressed will be written to that device.
-  This is most useful for applications, as yet unwritten, which perform
-  actions based on how many times the button is pressed in a row.
-  Do not hold the button down for too long, as the driver does not alter
-  the behaviour of the hardware reset circuitry attached to the button;
-  it will still execute a hard reset if the button is held down for
-  longer than approximately five seconds.
+  If you say Y here and create a character device node /dev/nwbutton
+  with major and minor numbers 10 and 158 ("man mknod"), then every
+  time the orange button is pressed a number of times, the number of
+  times the button was pressed will be written to that device.
+
+  This is most useful for applications, as yet unwritten, which
+  perform actions based on how many times the button is pressed in a
+  row.
+
+  Do not hold the button down for too long, as the driver does not
+  alter the behaviour of the hardware reset circuitry attached to the
+  button; it will still execute a hard reset if the button is held
+  down for longer than approximately five seconds.
+
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt. The module will be called nwbutton.o.
+
   Most people will answer Y to this question and "Reboot Using Button"
   below to be able to initiate a system shutdown from the button.
 
 Reboot Using Button
 CONFIG_NWBUTTON_REBOOT
-  If you enable this option, then you will be able to initiate a system
+  If you say Y here, then you will be able to initiate a system
   shutdown and reboot by pressing the orange button a number of times.
-  The number of presses to initiate the shutdown is two by default, but
-  this can be altered by modifying the value of NUM_PRESSES_REBOOT in
-  nwbutton.h and recompiling the driver or, if you compile the driver as
-  a module, you can specify the number of presses at load time with
-  "insmod button reboot_count=<something>".
+  The number of presses to initiate the shutdown is two by default,
+  but this can be altered by modifying the value of NUM_PRESSES_REBOOT
+  in nwbutton.h and recompiling the driver or, if you compile the
+  driver as a module, you can specify the number of presses at load
+  time with "insmod button reboot_count=<something>".
 
 Sound card support
 CONFIG_SOUND
@@ -9715,29 +10267,27 @@ CONFIG_SOUND
   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 ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. General
-  information about the modular sound system is contained in the files
+  You want to read the Sound-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto . General information
+  about the modular sound system is contained in the files
   Documentation/sound/Introduction. The file
   Documentation/sound/README.OSS contains some slightly outdated but
   still useful information as well.
 
   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
+  http://www.roestock.demon.co.uk/isapnptools/ ), 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
   Documentation/sound/README.modules; the module will be called
   soundcore.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 supporting utilities to do that are in the pcsp
-  package, available at http://www.imladris.demon.co.uk/pcsp/.
+  package, available at http://www.imladris.demon.co.uk/pcsp/ .
 
 OSS sound modules
 CONFIG_SOUND_OSS
@@ -9923,6 +10473,12 @@ CONFIG_SOUND_MSS
   have their own MSS support and saying Y to this option will cause a
   conflict.
 
+SGI Visual Workstation on-board audio
+CONFIG_SOUND_VWSND
+  Say Y or M if you have an SGI Visual Workstation and you want to
+  be able to use its on-board audio.  Read Documentation/sound/visws
+  for more info on this driver's capabilities.
+
 Ensoniq Soundscape support
 CONFIG_SOUND_SSCAPE
   Answer Y if you have a sound card based on the Ensoniq SoundScape
@@ -10123,8 +10679,8 @@ CONFIG_AWE32_SYNTH
   Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
   similar sound card. See Documentation/sound/README.awe,
   Documentation/sound/AWE32 and the Soundblaster-AWE mini-HOWTO,
-  available via FTP (user: anonymous) from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini for more info.
+  available from http://metalab.unc.edu/mdw/linux.html#howto for more
+  info.
 
 Gallant's Audio Excel DSP 16 support (SC-6000 and SC-6600)
 CONFIG_AEDSP16
@@ -10166,9 +10722,9 @@ CONFIG_AEDSP16_SB_IRQ
 
 Audio Excel DSP 16 DMA
 CONFIG_AEDSP16_SB_DMA
-  This is the IRQ of the Audio Excel DSP 16 card. It must be 0, 1 or 3.
-  If you compiled aedsp16.o as a module you can specify this parameter
-  as 'dma=NN'.
+  This is the IRQ of the Audio Excel DSP 16 card. It must be 0, 1 or
+  3. If you compiled aedsp16.o as a module you can specify this
+  parameter as 'dma=NN'.
 
 Audio Excel DSP 16 (MSS emulation)
 CONFIG_AEDSP16_MSS
@@ -10222,12 +10778,6 @@ CONFIG_AEDSP16_MPU_IRQ
   you compiled aedsp16.o as a module you can specify this parameter as
   'mpu_irq=NN'.
 
-SGI Visual Workstation on-board audio
-CONFIG_SOUND_VWSND
-  Say Y or M if you have an SGI Visual Workstation and you want to
-  be able to use its on-board audio.  Read Documentation/sound/visws
-  for more info on this driver's capabilities.
-
 Ensoniq ES1370 based PCI sound cards
 CONFIG_SOUND_ES1370
   Say Y or M if you have a PCI sound card utilizing the Ensoniq
@@ -10239,10 +10789,6 @@ CONFIG_SOUND_ES1370
   This driver differs slightly from OSS/Free, so PLEASE READ
   Documentation/sound/es1370.
 
-Joystick support at boot time
-CONFIG_SOUND_ES1370_JOYPORT_BOOT
-  Say Y here to use the joystick port of your sound card.
-
 Ensoniq ES1371 based PCI sound cards
 CONFIG_SOUND_ES1371
   Say Y or M if you have a PCI sound card utilizing the Ensoniq
@@ -10253,19 +10799,6 @@ CONFIG_SOUND_ES1371
   models are either ES1370 or ES1371 based. This driver differs
   slightly from OSS/Free, so PLEASE READ Documentation/sound/es1371.
 
-Joystick support at boot time
-CONFIG_SOUND_ES1371_JOYPORT_BOOT
-  Say Y here to use the joystick port of your sound card.
-
-Gameport I/O-range selection
-CONFIG_SOUND_ES1371_GAMEPORT
-  Select the I/O-range of the gameport on a ES1371 based sound card.
-  The card uses 8 ioports and the gameport is available at all eight
-  ioports. Legal hexadecimal values are 200, 208, 210 and 218.
-  The joystick driver will by default use 0x201. 
-  Leave the default 200 unless you have a joystick not attached
-  to your sound card.
-
 ESS Solo1 based PCI sound cards (eg. SC1938)
 CONFIG_SOUND_ESSSOLO1
   Say Y or M if you have a PCI sound card utilizing the ESS Technology
@@ -10328,9 +10861,7 @@ CONFIG_ISDN
   conversations while downloading stuff. It only works if your
   computer is equipped with an ISDN card and both you and your service
   provider purchased an ISDN line from the phone company. For details,
-  read http://alumni.caltech.edu/~dank/isdn/ 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.)
+  read http://alumni.caltech.edu/~dank/isdn/ on the WWW.
 
   This driver allows you to use an ISDN-card for networking
   connections and as dialin/out device. The isdn-tty's have a built in
@@ -10390,15 +10921,18 @@ ISDN diversion services support
 CONFIG_ISDN_DIVERSION
   This option allows you to use some supplementary diversion
   services in conjunction with the HiSax driver on an EURO/DSS1
-  line. Supported options are CD (call deflection), CFU (Call 
-  forward unconditional), CFB (Call forward when busy) and CFNR 
-  (call forward not reachable).
-  Additionally the actual CFU, CFB and CFNR state may be 
-  interrogated. The use of CFU, CFB, CFNR and interrogation may
-  be limited to some countries. The keypad protocol is still not
-  implemented.
-  CD should work in all countries if this service has been sub-
-  scribed.
+  line. 
+
+  Supported options are CD (call deflection), CFU (Call forward
+  unconditional), CFB (Call forward when busy) and CFNR (call forward
+  not reachable). Additionally the actual CFU, CFB and CFNR state may
+  be interrogated.
+
+  The use of CFU, CFB, CFNR and interrogation may be limited to some
+  countries. The keypad protocol is still not implemented. CD should
+  work in all countries if the service has been subscribed to.
+
+  Please read the file Documentation/isdn/README.diversion.
 
 ICN 2B and 4B support
 CONFIG_ISDN_DRV_ICN
@@ -10622,32 +11156,30 @@ CONFIG_ISDN_DRV_SC
   can be inserted in and removed from the running kernel whenever you
   want, details in Documentation/modules.txt); the module will be
   called sc.o. See Documentation/isdn/README.sc and
-  http://www.spellcast.com for more information (to browse the WWW,
-  you need to have access to a machine on the Internet that has a
-  program like lynx or netscape).
+  http://www.spellcast.com for more information.
 
 Eicon.Diehl active card support
 CONFIG_ISDN_DRV_EICON
   Say Y here if you have an Eicon active ISDN card. In order to use
   this card, additional firmware is necessary, which has to be loaded
-  into the card using the eiconctrl utility which is part of the latest
-  isdn4k-utils package. Please read the file
+  into the card using the eiconctrl utility which is part of the
+  latest isdn4k-utils package. Please read the file
   Documentation/isdn/README.eicon for more information.
   
 Eicon old-type card support
 CONFIG_ISDN_DRV_EICON_ISA
-  Say Y here if you have an old-type Eicon active ISDN card. In order to
-  use this card, additional firmware is necessary, which has to be loaded
-  into the card using the eiconctrl utility which is part of the latest
-  isdn4k-utils package. Please read the file
+  Say Y here if you have an old-type Eicon active ISDN card. In order
+  to use this card, additional firmware is necessary, which has to be
+  loaded into the card using the eiconctrl utility which is part of
+  the latest isdn4k-utils package. Please read the file
   Documentation/isdn/README.eicon for more information.
 
 Support AT-Fax Class 2 commands
 CONFIG_ISDN_TTY_FAX
   If you say Y here, the modem-emulator will support a subset of the
   Fax Class 2 commands. Using a getty with fax-support
-  (mgetty+sendfax, hylafax), you will be able to use your Linux box 
-  as an ISDN-fax-machine. This must be supported by the lowlevel driver
+  (mgetty+sendfax, hylafax), you will be able to use your Linux box as
+  an ISDN-fax-machine. This must be supported by the lowlevel driver
   also. See Documentation/isdn/README.fax for more information.
 
 AVM-B1 with CAPI2.0 support
@@ -10655,12 +11187,10 @@ CONFIG_ISDN_DRV_AVMB1
   This enables support for the AVM B1 ISDN networking cards. In
   addition, a CAPI (Common ISDN Application Programming Interface, a
   standard making it easy for programs to access ISDN hardware, see
-  http://www.capi.org/; to browse the WWW, you need to have access to
-  a machine on the Internet that has a program like lynx or netscape)
-  interface for this card is provided. In order to use this card,
-  additional firmware is necessary, which has to be downloaded into
-  the card using a utility which is distributed separately. Please
-  read the file Documentation/isdn/README.avmb1. 
+  http://www.capi.org/ ) interface for this card is provided. In order
+  to use this card, additional firmware is necessary, which has to be
+  downloaded into the card using a utility which is distributed
+  separately. Please read the file Documentation/isdn/README.avmb1.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -10685,9 +11215,8 @@ Support for AP1000 multicomputer
 CONFIG_AP1000
   This enables support for a SPARC based parallel multi-computer
   called AP1000+. For details on our efforts to port Linux to this
-  machine see http://cap.anu.edu.au/cap/projects/linux (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape) or mail to hackers@cafe.anu.edu.au
+  machine see http://cap.anu.edu.au/cap/projects/linux or mail to
+  hackers@cafe.anu.edu.au
 
 Support for Sun4 architecture
 CONFIG_SUN4
@@ -10713,12 +11242,11 @@ CONFIG_SUN_OPENPROMIO
 Mostek real time clock support
 CONFIG_SUN_MOSTEK_RTC
   The Mostek RTC chip is used on all knows Sun computers except
-  some JavaStation-s. For a JavaStation you need to say Y both here
-  and to CONFIG_RTC.
+  some JavaStations. For a JavaStation you need to say Y both here
+  and to "Enhanced Real Time Clock Support".
 
   Say Y here unless you are building a special purpose kernel.
 
-#
 #Siemens SAB82532 serial support
 #CONFIG_SAB82532
 ###
@@ -10765,13 +11293,13 @@ CONFIG_HP300
 
 Sun 3 support
 CONFIG_SUN3
-  This option enables support for the Sun 3 series of workstations.
-  Be warned that this support is very experimental. You will also
-  want to say Y to 68020 support and N to the other processors below.
-  Currently, it is not possible to build a kernel with support for
-  the Sun 3 and and something else, so make sure you have said N to
-  all the other machines. This option does not support the sun3x series
-  of machines (the Sun 3/80 and 3/460). If you don't want to compile a
+  This option enables support for the Sun 3 series of workstations. Be
+  warned that this support is very experimental. You will also want to
+  say Y to 68020 support and N to the other processors below.
+  Currently, it is not possible to build a kernel with support for the
+  Sun 3 and something else, so make sure you have said N to all the
+  other machines. This option does not support the sun3x series of
+  machines (the Sun 3/80 and 3/460). If you don't want to compile a
   kernel for a Sun 3, say N.
 
 68020 support
@@ -10858,9 +11386,10 @@ CONFIG_ZORRO
   Note that even if you say N here, you can still use your expansion
   cards. If in doubt, say Y.
 
+Amiga 1200/600 PCMCIA support
 CONFIG_AMIGA_PCMCIA
-  Include support in the kernel for pcmcia on Amiga 1200 and Amiga 600.
-  If you intend to use pcmcia cards say Y; otherwise say N.
+  Include support in the kernel for pcmcia on Amiga 1200 and Amiga
+  600. If you intend to use pcmcia cards say Y; otherwise say N.
 
 Amiga GSP (TMS340x0) support
 CONFIG_AMIGA_GSP
@@ -11242,14 +11771,6 @@ CONFIG_DIO
   HP300 machines. If you are using such a system you almost certainly
   want this.
 
-MSDOS partition support
-CONFIG_MSDOS_PARTITION
-  This option enables support for using hard disks that were
-  partitioned on an MS-DOS system. This may be useful if you are
-  sharing a hard disk between i386 and m68k Linux boxes, for example.
-  Say Y if you need this feature; users who are only using their
-  system-native partitioning scheme can say N here.
-
 Processor Type
 CONFIG_6xx
   There are two types of PowerPC chips supported. The more common
@@ -11332,7 +11853,7 @@ CONFIG_VIDEO_DEV
   Support for audio/video capture and overlay devices and FM radio
   cards. The exact capabilities of each device vary. User tools for
   this are available from
-  ftp://ftp.uk.linux.org/pub/linux/video4linux.
+  ftp://ftp.uk.linux.org/pub/linux/video4linux .
 
   If you are interested in writing a driver for such an audio/video
   device or user software interacting with such a driver, please read
@@ -11343,17 +11864,6 @@ CONFIG_VIDEO_DEV
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
-Direct Rendering Manager (XFree86 DRI support)
-CONFIG_DRM
-  Kernel-level support for the Direct Rendering Infrastructure (DRI)
-  introduced in XFree86 4.x.  These modules provide support for
-  synchronization, security, and DMA transfers.  Select the module that
-  provides support for your graphics card.
-
-3dlabs GMX 2000 Direct Rendering Driver (XFree86 DRI support)
-CONFIG_DRM_GAMMA
-  Choose M here if you have a 3dlabs GMX 2000 graphics card.
-
 AIMSlab RadioTrack (aka RadioReveal) support
 CONFIG_RADIO_RTRACK
   Choose Y here if you have one of these FM radio cards, and then fill
@@ -11363,13 +11873,16 @@ CONFIG_RADIO_RTRACK
   and are not supported by this driver. For these cards, use the
   RadioTrack II driver below.
 
+  If you have a GemTeks combined (PnP) sound- and radio card you must
+  use this driver as a module and setup the card with isapnptools. You
+  must also pass the module a suitable io parameter, 0x248 has been
+  reported to be used by these cards.
+
   In order to control your radio card, you will need to use programs
-  that are compatible with the Video for Linux API. Information on 
+  that are compatible with the Video for Linux API. Information on
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape. More information is contained in the
-  file Documentation/video4linux/radiotrack.txt.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml . More information
+  is contained in the file Documentation/video4linux/radiotrack.txt.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -11386,17 +11899,10 @@ CONFIG_RADIO_RTRACK2
   Choose Y here if you have this FM radio card, and then fill in the 
   port address below.
 
-  If you have GemTeks combined (PnP) sound- and radio card you must use
-  this driver as a module and setup the card with isapnptools. You must
-  also pass the module a suitable io parameter, 0x248 has been reported
-  to be used by these cards.
-
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on 
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -11416,9 +11922,7 @@ CONFIG_RADIO_AZTECH
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on 
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -11431,6 +11935,28 @@ CONFIG_RADIO_AZTECH_PORT
   haven't changed the setting of jumper JP3 on the card. Removing the
   jumper sets the card to 0x358.
 
+ADS Cadet AM/FM Radio Tuner Card
+CONFIG_RADIO_CADET
+  Choose Y here if you have one of these AM/FM radio cards, and then
+  fill in the port address below.
+  
+  In order to control your radio card, you will need to use programs
+  that are compatible with the Video for Linux API. Information on 
+  this API and pointers to "v4l" programs may be found on the WWW at
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
+
+  Further documentation on this driver can be found on the WWW at
+  http://linux.blackhawke.net/cadet.html . 
+
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called radio-cadet.o.
+
+ADS Cadet AM/FM Radio Tuner Card I/O Port
+CONFIG_RADIO_CADET_PORT
+  Enter the I/O address of the card here (most commonly 330). 
+
 SF16FMI Radio
 CONFIG_RADIO_SF16FMI
   Choose Y here if you have one of these FM radio cards, and then fill
@@ -11439,9 +11965,7 @@ CONFIG_RADIO_SF16FMI
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on 
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -11460,9 +11984,7 @@ CONFIG_RADIO_TYPHOON
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on 
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -11511,21 +12033,16 @@ ZOLTRIX I/O port (0x20c or 0x30c)
 CONFIG_RADIO_ZOLTRIX_PORT
   Enter the I/O port of your Zoltrix radio card.
 
-ADS Cadet AM/FM Tuner
-CONFIG_RADIO_CADET
-  Say Y here if this is your AM/FM radio card.
-
-  In order to control your radio card, you will need to use programs
-  that are compatible with the Video for Linux API. Information on 
-  this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape.
+IIC on parallel port
+CONFIG_I2C_PARPORT
+  I2C is a simple serial bus system used in many micro controller
+  applications. Saying Y here will allow you to use your parallel port
+  as an I2C interface.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
-  called radio-cadet.o
+  called i2c-parport.o.
 
 Miro PCM20 Radio
 CONFIG_RADIO_MIROPCM20
@@ -11536,9 +12053,7 @@ CONFIG_RADIO_MIROPCM20
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on 
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a 
-  program like lynx or netscape.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -11581,11 +12096,11 @@ CONFIG_RADIO_TERRATEC
   Choose Y here if you have this FM radio card, and then fill in the
   port address below. (TODO)
 
-  Note: This driver is in its early stages. Right now volume and frequency
-  control and muting works at least for me, but unfortunately i have not
-  found anybody who wants to use this card with linux. So if it is this
-  what YOU are trying to do right now, PLEASE DROP ME A NOTE!!
-  Rolf Offermanns (rolf@offermanns.de)
+  Note: This driver is in its early stages. Right now volume and
+  frequency control and muting works at least for me, but
+  unfortunately i have not found anybody who wants to use this card
+  with linux. So if it is this what YOU are trying to do right now,
+  PLEASE DROP ME A NOTE!! Rolf Offermanns (rolf@offermanns.de)
   
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on
@@ -11594,12 +12109,16 @@ CONFIG_RADIO_TERRATEC
   you need to have access to a machine on the Internet that has a
   program like lynx or netscape.
 
-
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
   called radio-terratec.o.
-  
+
+# Zoran ZR36057/36060 support
+# CONFIG_VIDEO_ZORAN
+
+# Include support for Iomega Buz
+# CONFIG_VIDEO_BUZ
 
 BT848 Video For Linux
 CONFIG_VIDEO_BT848
@@ -11651,10 +12170,10 @@ Compaq SMART2 support
 CONFIG_BLK_CPQ_DA
    This is the driver for Compaq Smart Array controllers.  
    Everyone using these boards should say Y here.  
-   See "linux/Documentation/cpqarray.txt" for the current list of 
+   See the file Documentation/cpqarray.txt for the current list of 
    boards supported by this driver, and for further information 
    on the use of this driver. 
- 
+
 #
 # ARM options
 #
@@ -11680,24 +12199,36 @@ CONFIG_CATS
 
 Include support for Intel EBSA285
 CONFIG_ARCH_EBSA285
-  Say Y here if you intend to run this kernel on an EBSA-285 evaluation
   board.
 
 Include support for the NetWinder
 CONFIG_ARCH_NETWINDER
   Say Y here if you intend to run this kernel on the NetWinder.
 
+Maximum Physical Memory
+CONFIG_1GB
+  Linux can use up to 2 Gigabytes (= 2^31 bytes) of physical memory.
+  If you are compiling a kernel which will never run on a machine with
+  more than 1 Gigabyte, answer "1GB" here. Otherwise, say "2GB".
+
+  The actual amount of physical memory should be specified using a
+  kernel command line option such as "mem=256M". (Try "man bootparam"
+  or see the documentation of your boot loader (lilo or loadlin) about
+  how to pass options to the kernel at boot time. The lilo procedure
+  is also explained in the SCSI-HOWTO, available from
+  http://metalab.unc.edu/mdw/linux.html#howto .)
+
 Math emulation
 CONFIG_NWFPE
-  Say Y to include the NWFPE floating point emulator in the kernel. This
-  is necessary to run most binaries. Linux does not currently support
-  floating point hardware so you need to say Y here even if your machine
-  has an FPA or floating point co-processor podule.
+  Say Y to include the NWFPE floating point emulator in the kernel.
+  This is necessary to run most binaries. Linux does not currently
+  support floating point hardware so you need to say Y here even if
+  your machine has an FPA or floating point co-processor podule.
 
   It is also possible to say M to build the emulator as a module
   (nwfpe.o) or indeed to leave it out altogether. However, unless you
-  know what you are doing this can easily render your machine unbootable.
-  Saying Y is the safe option.
+  know what you are doing this can easily render your machine
+  unbootable. Saying Y is the safe option.
 
   You may say N here if you are going to load the Acorn FPEmulator
   early in the bootup.
@@ -11721,6 +12252,12 @@ CONFIG_DEBUG_ERRORS
   you are concerned with the code size or don't want to see these
   messages.
 
+Build Tools Selection
+CONFIG_BINUTILS_NEW
+  Say Y here if and only if you're using GCC 2.8.1/EGCS with a
+  binutils version >= 2.8.1 to compile the kernel (check with "gcc
+  --version" and "ld -v").
+
 Compile kernel with frame pointer
 CONFIG_FRAME_POINTER
   If you say Y here, the resulting kernel will be slightly larger and
@@ -11729,10 +12266,10 @@ CONFIG_FRAME_POINTER
 
 User fault debugging
 CONFIG_DEBUG_USER
-  When a user program crashes due to an exception, the kernel can print
-  a brief message explaining what the problem was. This is sometimes
-  helpful for debugging but serves no purpose on a production system.
-  Most people should say N here.
+  When a user program crashes due to an exception, the kernel can
+  print a brief message explaining what the problem was. This is
+  sometimes helpful for debugging but serves no purpose on a
+  production system. Most people should say N here.
 
 Include gdb debugging information in kernel binary
 CONFIG_DEBUG_INFO
@@ -11740,25 +12277,27 @@ CONFIG_DEBUG_INFO
   `vmlinux' binary image. This is handy if you want to use gdb or
   addr2line to debug the kernel. It has no impact on the in-memory
   footprint of the running kernel but it can increase the amount of
-  time and disk space needed for compilation. If in doubt say N.
+  time and disk space needed for compilation of the kernel. If in
+  doubt say N.
 
 Split initialisation functions into discardable section
 CONFIG_TEXT_SECTIONS
-  Normally code that is only used during initialisation is collected
-  into a special area of the kernel so that it can be discarded and
-  the memory reclaimed when initialisation is complete. In addition,
-  if the kernel you wish to build is able to run on multiple
-  architectures, it allows the unused code to be discarded. Some
-  versions of binutils, however, have a bug that causes the kernel
-  to crash during startup when this option is enabled. Say Y unless
-  you experience problems that you suspect may be caused by this.
+  If you say Y here, kernel code that is only used during
+  initialisation is collected into a special area of the kernel so
+  that it can be discarded and the memory reclaimed when
+  initialisation is complete. In addition, if the kernel you wish to
+  build is able to run on multiple architectures, it allows the unused
+  code to be discarded. Some versions of binutils, however, have a bug
+  that causes the kernel to crash during startup when this option is
+  enabled. Say Y unless you experience problems that you suspect may
+  be caused by this.
 
 Disable pgtable cache
 CONFIG_NO_PGT_CACHE
-  Normally the kernel maintains a `quicklist' of preallocated pagetable
-  structures in order to increase performance. On machines with very
-  few pages this may however be a loss. Say Y here to disable the pgtable
-  cache.
+  Normally the kernel maintains a `quicklist' of preallocated
+  pagetable structures in order to increase performance. On machines
+  with very few pages this may however be a loss. Say Y here to
+  disable the pgtable cache.
 
 RISC OS personality
 CONFIG_ARTHUR
@@ -11774,16 +12313,17 @@ CONFIG_CMDLINE
   for the boot loader to pass arguments to the kernel. For these
   architectures, you should supply some command-line options at build
   time by entering them here. As a minimum, you should specify the
-  memory size and the root device (eg, mem=64M root=/dev/nfs)
+  memory size and the root device (e.g., mem=64M root=/dev/nfs)
 
 Hardware alignment trap
 CONFIG_ALIGNMENT_TRAP
-  ARM processors can not fetch/store information which is not naturally
-  aligned on the bus, ie, a 4 byte fetch must start at an address divisable
-  by 4.  On 32-bit ARM processors, these instructions can be emulated in
-  software with a severe performance impact. This is necessary for correct
-  operation of some network protocols.  With an IP-only configuration
-  it is safe to say N, otherwise say Y.
+  ARM processors can not fetch/store information which is not
+  naturally aligned on the bus, i.e., a 4 byte fetch must start at an
+  address divisible by 4. On 32-bit ARM processors, these non-aligned
+  fetch/store instructions will be emulated in software if you say
+  here, which has a severe performance impact. This is necessary for
+  correct operation of some network protocols. With an IP-only
+  configuration it is safe to say N, otherwise say Y.
 
 21285 serial port support
 CONFIG_SERIAL_21285
@@ -11794,32 +12334,32 @@ CONFIG_SERIAL_21285
 Console on 21285 serial port
 CONFIG_SERIAL_21285_CONSOLE
   If you have enabled the serial port on the 21285 footbridge you can
-  make it the console by answering 'Y' to this option.
+  make it the console by answering Y to this option.
 
 Footbridge Mode
 CONFIG_HOST_FOOTBRIDGE
   The 21285 Footbridge chip can operate in either `host mode' or
   `add-in' mode.  Say Y if your 21285 is in host mode, and therefore
-  is the configuration master, otherwise say N.  This must not be
-  set to 'Y' if the card is used in 'add-in' mode.
+  is the configuration master, otherwise say N. This must not be
+  set to Y if the card is used in 'add-in' mode.
 
-MFM harddisk support
+MFM hard disk support
 CONFIG_BLK_DEV_MFM
   Support the MFM hard drives on the Acorn Archimedes both
   on-board the A4x0 motherboards and via the Acorn MFM podules.
-  Drives upto 64MB are supported. If you haven't got one of these
-  machines or drives just say 'N'.
+  Drives up to 64MB are supported. If you haven't got one of these
+  machines or drives just say N.
 
 Old Archimedes floppy (1772) support
 CONFIG_BLK_DEV_FD1772
   Support the floppy drive on the Acorn Archimedes (A300, A4x0, A540,
   R140 and R260) series of computers; it supports only 720K floppies
   at the moment. If you don't have one of these machines just answer
-  'N'.
+  N.
 
 Autodetect hard drive geometry
 CONFIG_BLK_DEV_MFM_AUTODETECT
-  If you answer 'Y' the MFM code will attempt to automatically detect
+  If you answer Y, the MFM code will attempt to automatically detect
   the cylinders/heads/sectors count on your hard drive. WARNING: This
   sometimes doesn't work and it also does some dodgy stuff which
   potentially might damage your drive.
@@ -11834,12 +12374,10 @@ CONFIG_IRDA
   some user-space utilities like the irmanager and probably irattach
   as well. For more information, see the file
   Documentation/networking/irda.txt. You also want to read the
-  IR-HOWTO, available from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO.
+  IR-HOWTO, available at http://metalab.unc.edu/mdw/linux.html#howto .
 
   This support is also available as a module. If you want to compile
-  it as a module, say M here and read Documentation/modules.txt. The
-  module will be called 
+  it as a module, say M here and read Documentation/modules.txt.
 
 IrDA Cache last LSAP
 CONFIG_IRDA_CACHE_LAST_LSAP
@@ -11943,6 +12481,17 @@ CONFIG_IRPORT_SIR
 
   If unsure, say Y.
 
+SiS5513 chipset support
+CONFIG_BLK_DEV_SIS5513
+  This driver ensures (U)DMA support for SIS5513 chipset based
+  mainboards. SiS620/530 UDMA mode 4, SiS5600/5597 UDMA mode 2, all
+  other DMA mode 2 limited chipsets are unsupported to date.
+
+  If you say Y here, you need to say Y to "Use DMA by default when
+  available" as well.
+
+  Please read the comments at the top of drivers/block/sis5513.c
+ 
 Winbond W83977AF IrDA Device Driver
 CONFIG_WINBOND_FIR
   Say Y here if you want to build IrDA support for the Winbond
@@ -12010,15 +12559,6 @@ CONFIG_GIRBIL_DONGLE
   by IrTTY. To activate support for Greenwich dongles you will have to
   insert "irattach -d girbil" in the /etc/irda/drivers script.
 
-Adaptec Airport 1000 and 2000 dongle
-CONFIG_AIRPORT_DONGLE
-  Say Y here if you want to build support for the Adaptec Airport 1000
-  and 2000 dongles. If you want to compile it as a module, say M here
-  and read Documentation/modules.txt. The Airport dongle attaches to
-  the normal 9-pin serial port connector, and can currently only be
-  used by IrTTY. To activate support for Airport dongles you will have
-  to insert "irattach -d airport" in the /etc/irda/drivers script.
-
 Parallax Litelink dongle
 CONFIG_LITELINK_DONGLE
   Say Y here if you want to build support for the Parallax Litelink
@@ -12028,6 +12568,16 @@ CONFIG_LITELINK_DONGLE
   by IrTTY. To activate support for Parallax dongles you will have to
   insert "irattach -d litelink" in the /etc/irda/drivers script.
 
+Adaptec Airport 1000 and 2000 dongle
+CONFIG_AIRPORT_DONGLE
+  Say Y here if you want to build support for the Adaptec Airport 1000
+  and 2000 dongles. If you want to compile it as a module, say M here
+  and read Documentation/modules.txt. The module will be called
+  airport.o. The Airport dongle attaches to the normal 9-pin serial
+  port connector, and can currently only be used by IrTTY. To activate
+  support for Airport dongles you will have to insert "irattach -d
+  airport" in the /etc/irda/drivers script.
+
 VME (Motorola and BVM) support
 CONFIG_VME
   Say Y here if you want to build a kernel for a 680x0 based VME
@@ -12106,104 +12656,10 @@ CONFIG_BVME6000_SCC
   boards from BVM Ltd.  Everyone using one of these boards should say
   Y here.
 
-Universal Serial Bus (USB) Support (Experimental)
-CONFIG_USB
-  This will enable support for the Universal Serial Bus (USB).  USB 
-  allows you to connect up to 127 external devices such as keyboards, 
-  mice, printers and modems to your computer through a USB connector.
-  This code can also be built as a module (i.e. code outside the 
-  kernel that can be added and removed at runtime), consult 
-  Documentation/modules.txt for more information.
-
-UHCI (intel PIIX4 and others) support
-CONFIG_USB_UHCI
-  The UHCI is the USB host controller for many computers, and is built
-  into all recent boards with intel PCI chipsets. This driver is
-  needed for these motherboards to support USB.
-
-OHCI (compaq and some others) support
-CONFIG_USB_OHCI
-  The OHCI (Open Host Controller Interface) is the USB host controller
-  on most non-Intel architectures, several USB-adding PCI cards, and
-  is on several x86 compatibles with non-Intel chipsets. This driver
-  is needed for these motherboards to support USB. There is presently
-  two OHCI drivers in development. Say 'N' here if you would like to
-  compile the other OHCI driver into the linux kernel.
-
-OHCI-HCD (other OHCI opt. Virt. Root Hub) support
-CONFIG_USB_OHCI_HCD
-  The OHCI (Open Host Controller Interface) is the USB host controller
-  on most non-Intel architectures, several USB-adding PCI cards, and
-  is on several x86 compatibles with non-Intel chipsets. This driver
-  is needed for these motherboards to support USB. There is presently
-  two OHCI drivers in development. 
-
-USB hub support
-CONFIG_USB_HUB
-  To expand beyond the USB ports on the computer, a device called a 
-  hub is used. This driver supports hubs, allowing them to be used. 
-  Say 'Y'.
-
-USB mouse support
-CONFIG_USB_MOUSE  
-  This driver allows mice to work under the USB stack. It currently
-  patches into /dev/ps2aux, although it does not require the ps2 
-  mouse code to be included in the kernel as well.
-
-USB keyboard support
-CONFIG_USB_KBD
-  This driver allows USB keyboards to work under the USB stack.
-
-USB audio parsing support (Preliminary)
-CONFIG_USB_AUDIO
-  This driver will eventually handle audio devices, such 
-  as USB speakers.
-
-USB Communications Device Class (ACM) support (Preliminary)
-CONFIG_USB_ACM
-  This driver handles devices which support the Abstract Control Model,
-  a subtype of the USB Communications Device Class. This includes many
-  USB-based modems and ISDN adapters. Add special files with:
-  mknod /dev/ttyACM0 c 166 0 
-  mknod /dev/ttyACM1 c 166 1
-  mknod /dev/ttyACM2 c 166 2
-  mknod /dev/ttyACM3 c 166 3
-
-USB Printer Device Class support (Preliminary)
-CONFIG_USB_PRINTER
-  This is a generic driver for USB printers.
-
-USS720 parport driver
-CONFIG_USB_USS720
-  This driver is for USB parallel port adapters that use the 
-  Lucent Technologies USS-720 chip.
-  
-  The chip has two modes: automatic mode and manual mode.
-  In automatic mode, it looks like a standard USB printer. Only
-  Printers may be connected to the USS-720 in this mode.
-  The generic USB printer driver (CONFIG_USB_PRINTER, above)
-  may be used in that mode.
-
-  Manual mode is not limited to printers, any parallel port
-  device should work. This driver utilizes manual mode.
-  Note however that some operations are three orders of a magnitude
-  slower than on a PCI/ISA Parallel Port, so timing critical
-  applications might not work.
-
-  Say Y or M if you own an USS-720 USB->Parport cable and
-  intend to connect anything other than a printer to it. 
-
-USB /proc filesystem entry support (Preliminary)
-CONFIG_USB_PROC
-  This reports USB drivers and devices in the /proc filesystem.
-  Entries are located in /proc/bus/usb.
-  Note that you must enable support for the proc filesystem
-  for this to work.
-
 Support for user-space parallel port device drivers
 CONFIG_PPDEV
   Saying Y to this adds support for /dev/parport device nodes.  This
-  is needed for programs that want low-level access to the parallel
+  is needed for programs that want portable access to the parallel
   port, for instance deviceid (which displays Plug-and-Play device
   IDs) and vlp (which makes a Linux computer act as though it's a
   printer).
@@ -12212,10 +12668,16 @@ CONFIG_PPDEV
   It is safe to say N to this -- it is not needed for normal printing
   or parallel port CD-ROM/disk support.
 
-Kernel httpd acceleration (experimental)
+  This support is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called ppdev.o.
+
+  If unsure, say N.
+
+Kernel httpd acceleration (EXPERIMENTAL)
 CONFIG_KHTTPD
   The kernel httpd acceleration daemon (kHTTPd) is a (limited) 
-  webserver build into the kernel. It is limited since it can only
+  web server build into the kernel. It is limited since it can only
   serve files from the filesystem. Saying "M" here builds the
   kHTTPd module; this is NOT enough to have a working kHTTPd. 
   For safety reasons, the module has to be activated by doing a
@@ -12226,7 +12688,6 @@ CONFIG_KHTTPD
   The kHTTPd is experimental. Be careful when using it on a production
   machine. Also note that kHTTPd doesn't support virtual servers yet.
 
-
 #
 # A couple of things I keep forgetting:
 #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, 
@@ -12288,7 +12749,7 @@ CONFIG_KHTTPD
 # LocalWords:  PMAX MILO Alphas Multia Tseng linuxelf endian mipsel mips drv HT
 # LocalWords:  kerneld callouts AdvanSys advansys Admin WDT DataStor EP verden
 # LocalWords:  wdt hdb hdc bugfix SiS vlb Acculogic CSA DTC dtc Holtek ht QDI
-# LocalWords:  QD qd UMC umc ALI ali www.linux.sgi.comm azstarnet cdr fb MDA ps esdi
+# LocalWords:  QD qd UMC umc ALI ali www.linux.sgi.com azstarnet cdr fb MDA ps esdi
 # LocalWords:  Avanti XL AlphaStations Jensen DECpc AXPpci UDB Cabriolet MCA RC
 # LocalWords:  AlphaPC mca AOUT OUTput PPro sipx gwdg lo nwe FourPort Boca unm
 # LocalWords:  Keepalive linefill RELCOM keepalive analogue CDR conf CDI INIT
@@ -12367,7 +12828,7 @@ CONFIG_KHTTPD
 # LocalWords:  KERNNAME kname ktype kernelname Kerneltype KERNTYPE Alt RX mdafb
 # LocalWords:  dataless kerneltype SYSNAME Comtrol Rocketport palmtop fbset EGS
 # LocalWords:  nvram SYSRQ SysRq PrintScreen sysrq NVRAMs NvRAM Shortwave RTTY
-# LocalWords:  hayes TX TMOUT
+# LocalWords:  Sitor Amtor Pactor GTOR hayes TX TMOUT JFdocs BIGMEM DAC IRQ's
 # LocalWords:  IDEPCI IDEDMA idedma PDC pdc TRM trm raidtools luthien nuclecu
 # LocalWords:  unam mx miguel koobera uic EMUL solaris pp ieee lpsg co DMAs TOS
 # LocalWords:  BLDCONFIG preloading jumperless BOOTINIT modutils multipath GRE
@@ -12453,5 +12914,40 @@ CONFIG_KHTTPD
 # LocalWords:  BVME BVME WRITETHROUGH copyback writethrough fwmark syncookie tu
 # LocalWords:  alphalinux GOBIOS csn chemnitz nat ACARD AMI MegaRAID megaraid
 # LocalWords:  QNXFS ISI isicom xterms Apollos VPN RCPCI rcpci sgi visws pcmcia
-# LocalWords:  IrLPT UIRCC Tecra
-
+# LocalWords:  IrLPT UIRCC Tecra Strebel jstrebel suse Eichwalder ke INI INIA
+# LocalWords:  FCP qlogicfc sym isapnp DTLK DoubleTalk rcsys dtlk DMAP SGIVW ar
+# LocalWords:  dmabuf EcoRadio MUTEFREQ GIrBIL girbil tepkom vol mha diplom PQS
+# LocalWords:  bmac Microgate SyncLink synclink hdlc excl ioaddr Tane tanep TCQ
+# LocalWords:  PDS SMALLDOS charsets bigfoot kernelfr mcs cls fw rsvp SKnet sk
+# LocalWords:  SKMC USB UHCI OHCI intel compaq usb ohci HCD Virt Compaq's hcd
+# LocalWords:  VROOTHUB KBD ARRs MCRs NWBUTTON nwbutton NUM WaveArtist APNE cpu
+# LocalWords:  apne blackhawke PlanB lu mlan planb NWFPE FPA nwfpe unbootable
+# LocalWords:  FPEmulator ds vmlinux initialisation discardable pgtable PGT mdw
+# LocalWords:  quicklist pagetable arthur StrongARM podule podules Autodetect
+# LocalWords:  dodgy IrPORT irport Litelink litelink SuSE rtfm internet hda CY
+# LocalWords:  multmode DriveReady SeekComplete DriveStatusError miscompile AEC
+# LocalWords:  mainboard's Digital's alim FastTrak aec PIIXn piix Gayle Eyetech
+# LocalWords:  Catweasel IDEDOUBLER Powerbook Centris ICSIDE RapIDE OSM HDM IOP
+# LocalWords:  HDM's OSM's lan FibreChannel ECP autoprobe itg lbl ipmasq cjb IC
+# LocalWords:  bieringer Caulfield's dreamtime decnet SIOCFIGCONF SIOCGIFCONF
+# LocalWords:  rtnetlink Endnode Aironet Arlan Telxon ylenurme arlan ACB aeschi
+# LocalWords:  Sealevel sealevel Cyclom br wanconfig tarball conectiva cycsyn
+# LocalWords:  devel bazar cyclomx NetGear GA IBMOL Lanstreamer uhci eu efs CYZ
+# LocalWords:  olympic linuxtr usbcore acm EZUSB downloader EFS XFS INTR op IIC
+# LocalWords:  heine soundcore JavaStations JavaStation GemTeks TerraTec TODO
+# LocalWords:  ActiveRadio Standalone terratec Rolf Offermanns rolf offermanns
+# LocalWords:  Zoran ZR Buz LML CPQ DA cpqarray PPDEV deviceid vlp ppdev atyfb
+# LocalWords:  AcceleRAID eXtremeRAID NETFILTER Netfilter masqueraded netfilter
+# LocalWords:  kernelnotes Cardbus PCMCIA's CardBus clgenfb Permedia YAM MMAP
+# LocalWords:  mmapped ATM atm PVCs SVCs InARP ATMARP neighbour neighbours MPOA
+# LocalWords:  VCs ENI FPGA Tonga MMF MF UTP printks ZeitNet ZN ZATM uPD SAR PN
+# LocalWords:  approx NICStAR NICs ForeRunnerLE Madge Collage ATMizer Dxxxx VCI
+# LocalWords:  ServeRAID IPS ips ipslinux gzip BSDCOMP LZW RAYCS Interphase app
+# LocalWords:  Tachyon IPHASE Surfboard NextLevel SURFboard jacksonville Tigon
+# LocalWords:  fventuri adelphia siglercm linuxpower AceNICs Starfire starfire
+# LocalWords:  ISOC CPiA cpia uss ACPI UDF DirectCD udf CDRW's OSF Manx acpi
+# LocalWords:  Unixware cymru Computone IntelliPort Intelliport computone SI sx
+# LocalWords:  adbmouse DRI DRM dlabs GMX PLCs Applicom fieldbus applicom int
+# LocalWords:  VWSND eg ESSSOLO CFU CFNR scribed eiconctrl eicon hylafax KFPU
+# LocalWords:  EXTRAPREC fpu mainboards KHTTPD kHTTPd khttpd Xcelerator
+# LocalWords:  LOGIBUSMOUSE
diff --git a/Documentation/devices.tex b/Documentation/devices.tex
index d4e10e7f7..03533ac8e 100644
--- a/Documentation/devices.tex
+++ b/Documentation/devices.tex
@@ -254,11 +254,13 @@ Your cooperation is appreciated.
 \major{86}{}{char }{SCSI media changer}
 \major{87}{}{char }{Sony Control-A1 stereo control bus}
 \major{88}{}{char }{COMX synchronous serial card}
-\major{  }{}{block}{Sixth IDE hard disk/CD-ROM interface}
-\major{89}{}{char }{I$^2$C bus interface}
 \major{  }{}{block}{Seventh IDE hard disk/CD-ROM interface}
+\major{89}{}{char }{I$^2$C bus interface}
+\major{  }{}{block}{Eighth IDE hard disk/CD-ROM interface}
 \major{90}{}{char }{Memory Technology Device (RAM, ROM, Flash)}
+\major{  }{}{block}{Ninth IDE hard disk/CD-ROM interface}
 \major{91}{}{char }{CAN-Bus controller}
+\major{  }{}{block}{Tenth IDE hard disk/CD-ROM interface}
 \major{92}{}{char }{Reserved for ith Kommunikationstechnik MIC ISDN card}
 \major{93}{}{char }{IBM Smart Capture Card frame grabber}
 \major{94}{}{char }{miroVIDEO DC10/30 capture/playback device}
@@ -1748,7 +1750,7 @@ on {\url http://home.pages.de/~videotext/\/}.
 \end{devicelist}
 
 \begin{devicelist}
-\major{  }{}{block}{Sixth IDE hard disk/CD-ROM interface}
+\major{  }{}{block}{Seventh IDE hard disk/CD-ROM interface}
         \minor{0}{/dev/hdm}{Master: whole disk (or CD-ROM)}
         \minor{64}{/dev/hdn}{Slave: whole disk (or CD-ROM)}
 \end{devicelist}
@@ -1765,7 +1767,7 @@ major number 3).
 \end{devicelist}
 
 \begin{devicelist}
-\major{  }{}{block}{Seventh IDE hard disk/CD-ROM interface}
+\major{  }{}{block}{Eighth IDE hard disk/CD-ROM interface}
         \minor{0}{/dev/hdo}{Master: whole disk (or CD-ROM)}
         \minor{64}{/dev/hdp}{Slave: whole disk (or CD-ROM)}
 \end{devicelist}
@@ -1784,7 +1786,7 @@ major number 3).
 \end{devicelist}
 
 \begin{devicelist}
-\major{  }{}{block}{Eighth IDE hard disk/CD-ROM interface}
+\major{  }{}{block}{Ninth IDE hard disk/CD-ROM interface}
 	\minor{0}{/dev/hdq}{Master: whole disk (or CD-ROM)}
 	\minor{64}{/dev/hdr}{Slave: whole disk (or CD-ROM)}
 \end{devicelist}
@@ -1801,7 +1803,7 @@ major number 3).
 \end{devicelist}
 
 \begin{devicelist}
-\major{  }{}{block}{Ninth IDE hard disk/CD-ROM interface}
+\major{  }{}{block}{Tenth IDE hard disk/CD-ROM interface}
 	\minor{0}{/dev/hds}{Master: whole disk (or CD-ROM)}
 	\minor{64}{/dev/hdt}{Slave: whole disk (or CD-ROM)}
 \end{devicelist}
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 9f911d1fc..13a48d06c 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -1215,7 +1215,7 @@ Your cooperation is appreciated.
 		  1 = /dev/comx1	COMX channel 1
 		    ...
 
-    block	Sixth IDE hard disk/CD-ROM interface
+    block	Seventh IDE hard disk/CD-ROM interface
 		  0 = /dev/hdm		Master: whole disk (or CD-ROM)
 		 64 = /dev/hdn		Slave: whole disk (or CD-ROM)
 
@@ -1227,7 +1227,7 @@ Your cooperation is appreciated.
 		  1 = /dev/i2c1		Second I2C adapter
 		    ...
 
-    block	Seventh IDE hard disk/CD-ROM interface
+    block	Eighth IDE hard disk/CD-ROM interface
 		  0 = /dev/hdo		Master: whole disk (or CD-ROM)
 		 64 = /dev/hdp		Slave: whole disk (or CD-ROM)
 
@@ -1241,7 +1241,7 @@ Your cooperation is appreciated.
 		 30 = /dev/mtd15	16th MTD (rw)
 		 31 = /dev/mtdr15	16th MTD (ro)
 
-    block	Eighth IDE hard disk/CD-ROM interface
+    block	Ninth IDE hard disk/CD-ROM interface
 		  0 = /dev/hdq		Master: whole disk (or CD-ROM)
 		 64 = /dev/hdr		Slave: whole disk (or CD-ROM)
 
@@ -1253,7 +1253,7 @@ Your cooperation is appreciated.
 		  1 = /dev/can1		Second CAN-Bus controller
 		    ...
 
-    block	Ninth IDE hard disk/CD-ROM interface
+    block	Tenth IDE hard disk/CD-ROM interface
 		  0 = /dev/hds		Master: whole disk (or CD-ROM)
 		 64 = /dev/hdt		Slave: whole disk (or CD-ROM)
 
diff --git a/Documentation/fb/clgenfb.txt b/Documentation/fb/clgenfb.txt
index aad85d9a9..4e3de5e83 100644
--- a/Documentation/fb/clgenfb.txt
+++ b/Documentation/fb/clgenfb.txt
@@ -45,9 +45,7 @@ Full support for startup video modes (modedb) will be integrated soon.
 Version 1.9.4.4
 ---------------
 * Preliminary Laguna support
-* Overhaul color register routines.  Shifts are now based on offset
-  values in var.cmap, so as long as those are correctly set for PReP
-  things should work (knock on wood).
+* Overhaul color register routines.
 * Associated with the above, console colors are now obtained from a LUT
   called 'palette' instead of from the VGA registers.  This code was
   modeled after that in atyfb and matroxfb.
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt
index c268d025a..925cc43f2 100644
--- a/Documentation/fb/framebuffer.txt
+++ b/Documentation/fb/framebuffer.txt
@@ -2,7 +2,7 @@
 			-----------------------
 
 Maintained by Geert Uytterhoeven <geert@linux-m68k.org>
-Last revised: November 7, 1998
+Last revised: October 7, 1999
 
 
 0. Introduction
@@ -304,7 +304,20 @@ applications, please refer to the following documentation:
       o linux/include/video/
 
 
-8. Downloading
+
+8. Mailing list
+---------------
+
+There's a _development_ mailing list at linux-fbdev@vuser.vu.union.edu,
+controlled by majordomo. Send an email with `help' in the message body to
+majordomo@vuser.vu.union.edu for subscription information.
+
+The mailing list is archived at
+
+    http://www.mail-archive.com/linux-fbdev@vuser.vu.union.edu/
+
+
+9. Downloading
 --------------
 
 All necessary files can be found at
@@ -313,8 +326,12 @@ All necessary files can be found at
 
 and on its mirrors.
 
+The latest version of fbset can be found at
+
+    http://www.cs.kuleuven.ac.be/~geert/bin/
+
   
-9. Credits                                                       
+10. Credits                                                       
 ----------                                                       
                 
 This readme was written by Geert Uytterhoeven, partly based on the original
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index cc9e3704b..aa075a45c 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -1,5 +1,5 @@
 Ioctl Numbers
-2 September 1999
+10 October 1999
 Michael Elizabeth Chastain
 <mec@shout.net>
 
@@ -114,6 +114,8 @@ Code	Seq#	Include File		Comments
 'e'	00-1F	linux/video_encoder.h	conflict!
 'e'	00-1F	net/irda/irtty.h	conflict!
 'f'	00-1F	linux/ext2_fs.h
+'h'	00-7F				Charon filesystem
+					<mailto:zapman@interlan.net>
 'i'	00-3F	linux/i2o.h
 'j'	00-3F	linux/joystick.h
 'k'	all	asm-sparc/kbio.h
@@ -140,6 +142,8 @@ Code	Seq#	Include File		Comments
 'v'	00-1F	linux/ext2_fs.h		conflict!
 'v'	all	linux/videodev.h	conflict!
 'w'	all				CERN SCI driver
+'y'	00-1F				packet based user level communications
+					<mailto:zapman@interlan.net>
 'z'	00-3F				CAN bus card
 					<mailto:hdstich@connectu.ulm.circular.de>
 'z'	40-7F				CAN bus card
diff --git a/Documentation/kbuild/config-language.txt b/Documentation/kbuild/config-language.txt
index 079f0c751..dce6086f9 100644
--- a/Documentation/kbuild/config-language.txt
+++ b/Documentation/kbuild/config-language.txt
@@ -1,5 +1,5 @@
 Config Language Specification
-21 January 1999
+28 September 1999
 Michael Elizabeth Chastain, <mailto:mec@shout.net>
 
 
@@ -82,7 +82,10 @@ Here are the basic grammar elements.
     double-quoted string.  If the word is unquoted or double quoted,
     then $-substition will be performed on the word.
 
-    A /symbol/ is a single unquoted word.
+    A /symbol/ is a single unquoted word.  A symbol must have a name of
+    the form CONFIG_*.  scripts/mkdep.c relies on this convention in order
+    to generate dependencies on individual CONFIG_* symbols instead of
+    making one massive dependency on include/linux/autoconf.h.
 
     A /dep/ is a dependency.  Syntactically, it is a /word/.  At run
     time, a /dep/ must evaluate to "y", "m", "n", or "".
@@ -355,8 +358,8 @@ This verb assigns the value of /word/ to /symbol/.  Any hexadecimal
 number is a legal value.
 
 Configure:  implemented
-Menuconfig: not implemented
-Xconfig:    not implemented
+Menuconfig: implemented
+Xconfig:    implemented
 mconfig:    implemented
 
 Example:
@@ -377,8 +380,8 @@ This verb assigns /symbol/ the value /word/.  Any decimal number is a
 legal value.
 
 Configure:  implemented
-Menuconfig: not implemented
-Xconfig:    not implemented
+Menuconfig: implemented
+Xconfig:    implemented
 mconfig:    implemented
 
 Example:
@@ -394,8 +397,8 @@ This verb assigns the value of /word/ to /symbol/.  Legal input values
 are any ASCII string, except for the characters '"' and '\\'.
 
 Configure:  implemented
-Menuconfig: not implemented
-Xconfig:    not implemented
+Menuconfig: implemented
+Xconfig:    implemented
 mconfig:    implemented
 
 Example
@@ -414,9 +417,9 @@ As soon as this verb is implemented in all interpreters, please use it
 instead of define_bool to define tristate values.  This aids in static
 type checking.
 
-Configure:  not implemented
-Menuconfig: not implemented
-Xconfig:    not implemented
+Configure:  implemented
+Menuconfig: implemented
+Xconfig:    implemented
 mconfig:    implemented
 
 Example:
@@ -433,22 +436,27 @@ Example:
 
 This verb evaluates all of the dependencies in the dependency list.
 Any dependency which has a value of "y" does not restrict the input
-range.  Any dependency which has a value of "n", or which has some
-other value, restricts the input range to "n".
+range.  Any dependency which has an empty value is ignored.
+Any dependency which has a value of "n", or which has some other value,
+restricts the input range to "n".  Quoting dependencies is not allowed.
+Using dependencies with an empty value possible is not recommended.
 
 If the input range is restricted to the single choice "n", dep_bool
 silently assigns "n" to /symbol/.  If the input range has more than
 one choice, dep_bool displays /prompt/ to the user, accepts a value
 from the user, and assigns that value to /symbol/.
 
-Configure:  not implemented
-Menuconfig: not implemented
-XConfig:    not implemented
+Configure:  implemented
+Menuconfig: implemented
+XConfig:    implemented
 mconfig:    implemented
 
     # not from the corpus
     dep_bool 'RZ1000 chipset bugfix/support' CONFIG_BLK_DEV_RZ1000 $CONFIG_PCI
 
+Known bugs:
+- Xconfig does not write "# foo is not set" to .config (as well as
+  "#unset foo" to autoconf.h) if command is disabled by its dependencies.
 
 
 === dep_hex /prompt/ /symbol/ /word/ /dep/ ...
@@ -464,13 +472,15 @@ mconfig:    not implemented
 
 
 
-=== dep_tristate /prompt/ /symbol /dep/ ...
+=== dep_tristate /prompt/ /symbol/ /dep/ ...
 
 This verb evaluates all of the dependencies in the dependency list.
-Any dependency which as a value of "y" does not restrict the input range.
+Any dependency which has a value of "y" does not restrict the input range.
 Any dependency which has a value of "m" restricts the input range to
-"m" or "n".  Any dependency which has a value of "n", or which has some
-other value, restricts the input range to "n".
+"m" or "n".  Any dependency which has an empty value is ignored.
+Any dependency which has a value of "n", or which has some other value,
+restricts the input range to "n".  Quoting dependencies is not allowed.
+Using dependencies with an empty value possible is not recommended.
 
 If the input range is restricted to the single choice "n", dep_tristate
 silently assigns "n" to /symbol/.  If the input range has more than
@@ -478,10 +488,13 @@ one choice, dep_tristate displays /prompt/ to the user, accepts a value
 from the user, and assigns that value to /symbol/.
 
 Configure:  implemented
-Menuconfig: implemented (but silently ignores dependencies after the first)
-Xconfig:    implemented (but silently ignores dependencies after the first)
+Menuconfig: implemented
+Xconfig:    implemented
 mconfig:    implemented
 
+Known bugs:
+- Xconfig does not write "# foo is not set" to .config (as well as
+  "#unset foo" to autoconf.h) if command is disabled by its dependencies.
 
 
 === unset /symbol/ ...
@@ -492,7 +505,7 @@ up deeper problems with variable semantics in a random-execution language.
 
 Configure:  implemented
 Menuconfig: implemented
-Xconfig:    not implemented
+Xconfig:    implemented (with bugs)
 mconfig:    implemented
 
 
@@ -570,14 +583,9 @@ Menuconfig: implemented
 XConfig:    implemented, with bugs
 mconfig:    implemented
 
-Xconfig has several known bugs, and probably some unknown bugs too:
-
-- In a comparison, if the left-hand atom is a variable and that variable
-  is from a choice list, the right-hand atom must be "y".
+Xconfig has some known bugs, and probably some unknown bugs too:
 
-- In a comparison, if the right-hand atom is a variable and that variable
-  is from a choice list, you lose.  tkparse will throw a segmentation
-  violation, silently generate bizarre TCL code, or something else.
+- literals with an empty "" value are not properly handled.
 
 - tkparse gives the wrong precedence to -o, -a, and !.  Don't use both
   -o and -a in an expression.  Don't use ! at all.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 02f1310e7..dc57ee651 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -266,9 +266,11 @@ or  parport=0xBBB[,IRQ[,DMA]]	to use any IRQ/DMA settings detected
 				IRQ/DMA settings because of possible
 				conflicts).  You can specify the base
 				address, IRQ, and DMA settings; IRQ
-				and DMA should be numbers or 'auto'
+				and DMA should be numbers, or 'auto'
 				(for using detected settings on that
-				particular port).  Parallel ports are
+				particular port), or 'nofifo' (to
+				avoid using a FIFO even if it is
+				detected).  Parallel ports are
 				assigned in the order they are
 				specified on the command line,
 				starting with parport0.
diff --git a/Documentation/networking/ray_cs.txt b/Documentation/networking/ray_cs.txt
new file mode 100644
index 000000000..b1def00bc
--- /dev/null
+++ b/Documentation/networking/ray_cs.txt
@@ -0,0 +1,151 @@
+September 21, 1999
+
+Copyright (c) 1998  Corey Thomas (corey@world.std.com)
+
+This file is the documentation for the Raylink Wireless LAN card driver for
+Linux.  The Raylink wireless LAN card is a PCMCIA card which provides IEEE
+802.11 compatible wireless network connectivity at 1 and 2 megabits/second.
+See http://www.raytheon.com/micro/raylink/ for more information on the Raylink
+card.  This driver is in early development and does have bugs.  See the known
+bugs and limitations at the end of this document for more information.
+This driver also works with WebGear's Aviator 2.4 and Aviator Pro
+wireless LAN cards.
+
+As of kernel 2.3.18, the ray_cs driver is part of the Linux kernel
+source.  My web page for the development of ray_cs is at
+http://world.std.com/~corey/raylink.html and I can be emailed at
+corey@world.std.com
+
+The kernel driver is based on ray_cs-1.62.tgz
+
+The driver at my web page is intended to be used as an add on to
+David Hinds pcmcia package.  All the command line parameters are
+available when compiled as a module.  When built into the kernel, only
+the essid= string parameter is available via the kernel command line.
+This will change after the method of sorting out parameters for all
+the PCMCIA drivers is agreed upon.  If you must have a built in driver
+with nondefault parameters, they can be edited in
+/usr/src/linux/drivers/net/pcmcia/ray_cs.c.  Searching for MODULE_PARM
+will find them all.
+
+Information on card services is available at:
+	ftp://hyper.stanford.edu/pub/pcmcia/doc
+        http://hyper.stanford.edu/HyperNews/get/pcmcia/home.html
+
+
+Card services user programs are still required for PCMCIA devices.
+pcmcia-cs-3.1.1 or greater is required for the kernel version of
+the driver.
+
+Currently, ray_cs is not part of David Hinds card services package,
+so the following magic is required.
+
+At the end of the /etc/pcmcia/config.opts file, add the line: 
+source ./ray_cs.opts 
+This will make card services read the ray_cs.opts file
+when starting.  Create the file /etc/pcmcia/ray_cs.opts containing the
+following:
+
+#### start of /etc/pcmcia/ray_cs.opts ###################
+# Configuration options for Raylink Wireless LAN PCMCIA card
+device "ray_cs"
+  class "network" module "misc/ray_cs"
+
+card "RayLink PC Card WLAN Adapter"
+  manfid 0x01a6, 0x0000
+  bind "ray_cs"
+
+module "misc/ray_cs" opts ""
+#### end of /etc/pcmcia/ray_cs.opts #####################
+
+
+To join an existing network with
+different parameters, contact the network administrator for the 
+configuration information, and edit /etc/pcmcia/ray_cs.opts.
+Add the parameters below between the empty quotes.
+
+Parameters for ray_cs driver which may be specified in ray_cs.opts:
+
+bc              integer         0 = normal mode (802.11 timing)
+                                1 = slow down inter frame timing to allow
+                                    operation with older breezecom access
+                                    points.
+
+beacon_period	integer         beacon period in Kilo-microseconds
+				legal values = must be integer multiple 
+                                               of hop dwell
+                                default = 256
+
+country         integer         1 = USA (default)
+                                2 = Europe
+                                3 = Japan
+                                4 = Korea
+                                5 = Spain
+                                6 = France
+                                7 = Israel
+                                8 = Australia
+
+essid		string		ESS ID - network name to join
+				string with maximum length of 32 chars
+				default value = "ADHOC_ESSID"
+
+hop_dwell	integer         hop dwell time in Kilo-microseconds 
+				legal values = 16,32,64,128(default),256
+
+irq_mask	integer         linux standard 16 bit value 1bit/IRQ
+				lsb is IRQ 0, bit 1 is IRQ 1 etc.
+				Used to restrict choice of IRQ's to use.
+                                Recommended method for controlling
+                                interrupts is in /etc/pcmcia/config.opts
+
+net_type	integer		0 (default) = adhoc network, 
+				1 = infrastructure
+
+phy_addr	string          string containing new MAC address in
+				hex, must start with x eg
+				x00008f123456
+
+psm		integer         0 = continuously active
+				1 = power save mode (not useful yet)
+
+pc_debug	integer		(0-5) larger values for more verbose
+				logging.  Replaces ray_debug.
+
+ray_debug	integer		Replaced with pc_debug
+
+ray_mem_speed   integer         defaults to 500
+
+sniffer         integer         0 = not sniffer (default)
+                                1 = sniffer which can be used to record all
+                                    network traffic using tcpdump or similar, 
+                                    but no normal network use is allowed.
+
+translate	integer		0 = no translation (encapsulate frames)
+				1 = translation    (RFC1042/802.1)
+
+
+More on sniffer mode:
+
+tcpdump does not understand 802.11 headers, so it can't
+interpret the contents, but it can record to a file.  This is only
+useful for debugging 802.11 lowlevel protocols that are not visible to
+linux.  If you want to watch ftp xfers, or do similar things, you
+don't need to use sniffer mode.  Also, some packet types are never
+sent up by the card, so you will never see them (ack, rts, cts, probe
+etc.)  There is a simple program (showcap) included in the ray_cs
+package which parses the 802.11 headers.
+
+Known Problems and missing features
+
+        Does not work with non x86
+
+	Does not work with SMP
+
+	Support for defragmenting frames is not yet debugged, and in
+	fact is known to not work.  I have never encountered a net set
+	up to fragment, but still, it should be fixed.
+
+	The ioctl support is incomplete.  The hardware address cannot be set
+	using ifconfig yet.  If a different hardware address is needed, it may
+	be set using the phy_addr parameter in ray_cs.opts.  This requires
+	a card insertion to take effect.
diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
new file mode 100644
index 000000000..feb78559e
--- /dev/null
+++ b/Documentation/nmi_watchdog.txt
@@ -0,0 +1,33 @@
+
+Is your SMP system locking up unpredictably? No keyboard activity, just
+a frustrating complete hard lockup? Do you want to help us debugging
+such lockups? If all yes then this document is definitely for you.
+
+on Intel SMP hardware there is a feature that enables us to generate
+'watchdog NMI interrupts'. (NMI: Non Maskable Interrupt - these get
+executed even if the system is otherwise locked up hard) This can be
+used to debug hard kernel lockups. By executing periodic NMI interrupts,
+the kernel can monitor wether any CPU has locked up, and print out
+debugging messages if so.  You can enable/disable the NMI watchdog at boot
+time with the 'nmi_watchdog=1' boot parameter. Eg. the relevant
+lilo.conf entry:
+
+        append="nmi_watchdog=1"
+
+A 'lockup' is the following scenario: if any CPU in the system does not
+execute the period local timer interrupt for more than 5 seconds, then
+the NMI handler generates an oops and kills the process. This
+'controlled crash' (and the resulting kernel messages) can be used to
+debug the lockup. Thus whenever the lockup happens, wait 5 seconds and
+the oops will show up automatically. If the kernel produces no messages
+then the system has crashed so hard (eg. hardware-wise) that either it
+cannot even accept NMI interrupts, or the crash has made the kernel
+unable to print messages.
+
+NOTE: currently the NMI-oopser is enabled unconditionally on x86 SMP
+boxes.
+
+[ feel free to send bug reports, suggestions and patches to
+  Ingo Molnar <mingo@redhat.com> or the Linux SMP mailing
+  list at <linux-smp@vger.rutgers.edu> ]
+
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 152e3f3cf..c932216df 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -67,7 +67,7 @@ If you compile the parport code into the kernel, then you can use
 kernel boot parameters to get the same effect.  Add something like the
 following to your LILO command line:
 
-	parport=0x3bc parport=0x378,7 parport=0x278,auto
+	parport=0x3bc parport=0x378,7 parport=0x278,auto,nofifo
 
 You can have many `parport=...' statements, one for each port you want
 to add.  Adding `parport=0' to the kernel command-line will disable