Merge with Linux 2.3.40.

author: Ralf Baechle <ralf@linux-mips.org> 2000-02-16 01:07:24 +0000
committer: Ralf Baechle <ralf@linux-mips.org> 2000-02-16 01:07:24 +0000
commit: 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree: 27a92a942821cde1edda9a1b088718d436b3efe4 /Documentation
parent: 45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
29 files changed, 2321 insertions, 1031 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index fd4072bc0..f07a1876f 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -319,13 +319,12 @@ Parallel Ports
 ==============
 
    As of 2.1.33, parallel port support can now by handled by the parport
-driver.  Be aware that with Plug-and-Play support turned on, your
-parallel port may no longer be where you expect it; for example, LPT1
-(under DOS) was sometimes /dev/lp1 in Linux, but will probably be
-/dev/lp0 with the new Plug-and-Play driver.  If printing breaks with
-the new driver, try checking your lpd configuration.  A good source of
-more information is the Documentation/parport.txt file included with
-the kernel.
+driver.  Be aware that your parallel port may no longer be where you
+expect it; for example, LPT1 (under DOS) was sometimes /dev/lp1 in
+Linux, but will probably be /dev/lp0 with the new parport driver.  If
+printing breaks with the new driver, try checking your lpd
+configuration.  A good source of more information is the
+Documentation/parport.txt file included with the kernel.
 
 Setserial
 =========
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index bb54b9b48..4ea28a70c 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -29,7 +29,7 @@
 #
 # 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
-# at http://metalab.unc.edu/mdw/linux.html#howto . Before you start
+# at http://www.linuxdoc.org/docs.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
@@ -118,6 +118,13 @@ CONFIG_SMP
   
   If you don't know what to do here, say N.
   
+APIC and IO-APIC Support on Uniprocessors
+CONFIG_X86_UP_IOAPIC
+  This option enables uniprocessor-kernels to switch into IO-APIC mode
+  if there is an IO-APIC in the system. Such a kernel will still boot
+  on IO-APIC-less systems with no slowdown at all. SMP kernels include
+  IO-APIC support unconditionally.
+
 Kernel math emulation
 CONFIG_MATH_EMULATION
   Linux can emulate a math coprocessor (used for floating point
@@ -134,7 +141,7 @@ CONFIG_MATH_EMULATION
   is broken. Try "man bootparam" or see the documentation of your boot
   loader (lilo or loadlin) about how to pass options to the kernel at
   boot time. The lilo procedure is also explained in the SCSI-HOWTO,
-  available from http://metalab.unc.edu/mdw/linux.html#howto .) This
+  available from http://www.linuxdoc.org/docs.html#howto .) This
   means that it is a good idea to say Y here if you intend to use this
   kernel on different machines.
 
@@ -326,7 +333,7 @@ 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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   To fine-tune IDE drive/interface parameters for improved
   performance, look for the hdparm package at
@@ -359,7 +366,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   People with SCSI-only systems can say N here.
 
@@ -420,7 +427,7 @@ CONFIG_BLK_DEV_IDECD
   to say Y or M to "ISO 9660 CDROM filesystem support".
 
   Read the CDROM-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto and the file
+  http://www.linuxdoc.org/docs.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
@@ -431,17 +438,6 @@ CONFIG_BLK_DEV_IDECD
   say M here and read Documentation/modules.txt. The module will be
   called ide-cd.o.
 
-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 a disk present, say Y.  If you say Y
-  and there is no multi-slot cdrom present, this code is skipped.
-
-  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.
-
 Include IDE/ATAPI TAPE support
 CONFIG_BLK_DEV_IDETAPE
   If you have an IDE tape drive using the ATAPI protocol, say Y.
@@ -450,6 +446,8 @@ CONFIG_BLK_DEV_IDETAPE
   can say N here.
 
   This now includes the OnStream DI-30 tape drive support.
+  Will not work with SCSI protocol, until there is support for the
+  SC-30 and SC-50 versions.
 
   If you say Y here, the tape drive will be identified at boot time
   along with other IDE devices, as "hdb" or "hdc", or something
@@ -489,6 +487,9 @@ CONFIG_BLK_DEV_IDESCSI
   and will allow you to use a SCSI device driver instead of a native
   ATAPI driver.
 
+  Must pass "hdx=scsi" per devices if you want the native EIDE sub-drivers
+  to skip over the native support.  This is required for use of CD-RW's.
+
   This is useful if you have an ATAPI device for which no native
   driver has been written (for example, an ATAPI PD-CD or CDR drive);
   you can then use this emulation together with an appropriate SCSI
@@ -503,6 +504,13 @@ CONFIG_BLK_DEV_IDESCSI
 
   People with SCSI-only systems can say N here. If unsure, say N.
 
+ISA-PNP EIDE support
+CONFIG_BLK_DEV_ISAPNP
+  If you have an ISA EIDE card that is PnP and requires setup first
+  before scanning for devices, say Y here.
+
+  If unsure, say N.
+
 CMD640 chipset bugfix/support
 CONFIG_BLK_DEV_CMD640
   The CMD-Technologies CMD640 IDE chip is used on many common 486 and
@@ -521,7 +529,7 @@ CONFIG_BLK_DEV_CMD640
   bootparam" or see the documentation of your boot loader about how to
   pass options to the kernel. The lilo procedure is also explained in
   the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .)
+  http://www.linuxdoc.org/docs.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
@@ -603,7 +611,7 @@ CONFIG_BLK_DEV_OFFBOARD
   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 .)
+  http://www.linuxdoc.org/docs.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.
@@ -634,7 +642,7 @@ CONFIG_BLK_DEV_AEC6210
 
   Please read the comments at the top of drivers/block/aec6210.c
 
-ALI M15x3 chipset support (EXPERIMENTAL)
+ALI M15x3 chipset support
 CONFIG_BLK_DEV_ALI15X3
   This driver ensures (U)DMA support for ALI 1543 and 1543C,
   1535, 1535D onboard chipsets.  It also tests for Simplex mode and
@@ -642,14 +650,29 @@ CONFIG_BLK_DEV_ALI15X3
 
   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 which uses this chipset.
+AMD7409 chipset support (EXPERIMENTAL)
+CONFIG_BLK_DEV_AMD7409
+  This driver ensures (U)DMA support for AMD756 Viper chipset.
+
+  If you say Y here, you also need to say Y to "Use DMA by default
+  when available", above.
+  Please read the comments at the top of drivers/block/amd7409.c
+
+  If unsure, say N.
+
+CMD64X chipset support
+CONFIG_BLK_DEV_CMD64X
+  Say Y here if you have an IDE controller which uses any of these chipsets,
+  CMD643, CMD646, or CMD648.
+
+CMD64X chipset RAID support (EXPERIMENTAL) (WIP)
+CONFIG_BLK_DEV_CMD64X
+  Work in progress for hardware raid ata-33/66..........rev 7 minimum.
+  Say N for now.
 
 CY82C693 chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_CY82C693
@@ -687,11 +710,16 @@ CONFIG_BLK_DEV_HPT366
 
   Please read the comments at the top of drivers/block/hpt366.c
 
-HPT366 Fast Interrupt support (EXPERIMENTAL)
+HPT366 Fast Interrupt support (EXPERIMENTAL) (WIP)
 HPT366_FAST_IRQ_PREDICTION
 
   If unsure, say N.
 
+HPT366 mode three unsupported (EXPERIMENTAL) (WIP)
+HPT366_MODE3
+  This is an undocumented mode that the HA366 can default to in many cases.
+  If unsure, say N.
+
 NS87415 support (EXPERIMENTAL)
 CONFIG_BLK_DEV_NS87415
   This driver adds detection and support for the NS87415 chip
@@ -713,7 +741,8 @@ CONFIG_BLK_DEV_PIIX
 
   Please read the comments at the top of drivers/block/piix.c
 
-  If unsure, say N.
+  Should also include "PIIXn Tuning support" CONFIG_BLK_DEV_PIIX_TUNING
+  If unsure, say Y.
 
 PIIXn Tuning support
 CONFIG_BLK_DEV_PIIX_TUNING
@@ -725,7 +754,7 @@ CONFIG_BLK_DEV_PIIX_TUNING
   Case 430HX/440FX PIIX3 need speed limits to reduce UDMA to DMA mode
   2 if the BIOS can not perform this task at initialization.
 
-  If unsure, say N.
+  If unsure, say Y.
 
 PROMISE PDC20246/PDC20262 support
 CONFIG_BLK_DEV_PDC202XX
@@ -1237,7 +1266,7 @@ CONFIG_BLK_DEV_MD
 
   More information about Software RAID on Linux is contained in the
   Software-RAID mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
+  http://www.linuxdoc.org/docs.html#howto . There you will also
   learn where to get the supporting user space utilities raidtools.
 
   If unsure, say N.
@@ -1265,7 +1294,7 @@ CONFIG_MD_STRIPED
 
   Information about Software RAID on Linux is contained in the
   Software-RAID mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
+  http://www.linuxdoc.org/docs.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
@@ -1287,7 +1316,7 @@ CONFIG_MD_MIRRORING
 
   Information about Software RAID on Linux is contained in the
   Software-RAID mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
+  http://www.linuxdoc.org/docs.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
@@ -1310,7 +1339,7 @@ CONFIG_MD_RAID5
 
   Information about Software RAID on Linux is contained in the
   Software-RAID mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . There you will also
+  http://www.linuxdoc.org/docs.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
@@ -1482,7 +1511,7 @@ CONFIG_NET
 
   For a general introduction to Linux networking, it is highly
   recommended to read the NET-3-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
 Socket filtering
 CONFIG_FILTER
@@ -1689,7 +1718,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
-  from http://metalab.unc.edu/mdw/linux.html#howto ), or other custom
+  from http://www.linuxdoc.org/docs.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
@@ -1794,7 +1823,7 @@ CONFIG_PCI
   VESA. If you have PCI, say Y, otherwise N. 
 
   The PCI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto , contains valuable
+  http://www.linuxdoc.org/docs.html#howto , contains valuable
   information about which PCI hardware does work under Linux and which
   doesn't.
 
@@ -1995,12 +2024,12 @@ CONFIG_SYSVIPC
   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
+  http://www.linuxdoc.org/docs.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 from
-  http://metalab.unc.edu/mdw/linux.html#guide .
+  http://www.linuxdoc.org/docs.html#guide .
 
   Saying Y here enlarges your kernel by about 18 KB. Just say Y.
 
@@ -2062,7 +2091,7 @@ CONFIG_BINFMT_ELF
   want to say Y here.
 
   Information about ELF is contained in the ELF HOWTO available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -2117,7 +2146,7 @@ CONFIG_BINFMT_MISC
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto ). Once you have
+  http://www.linuxdoc.org/docs.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.
@@ -2195,7 +2224,7 @@ CONFIG_VIDEO_SELECT
   "man bootparam" or see the documentation of your boot loader about
   how to pass options to the kernel. The lilo procedure is also
   explained in the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .)
+  http://www.linuxdoc.org/docs.html#howto .)
 
   Read the file Documentation/svga.txt for more information about the
   Video mode selection support. If unsure, say N.
@@ -2335,8 +2364,8 @@ S3 Trio frame buffer device support
 CONFIG_FB_S3TRIO
   If you have a S3 Trio say Y. Say N for S3 Virge. 
 
-ATI Mach64 display support
-CONFIG_FB_ATY (EXPERIMENTAL)
+ATI Mach64 display support (EXPERIMENTAL)
+CONFIG_FB_ATY
   This driver supports graphics boards with the ATI Mach64 chips.
   Say Y if you have such a graphics board.
 
@@ -2344,6 +2373,16 @@ CONFIG_FB_ATY (EXPERIMENTAL)
   inserted and removed from the running kernel whenever you want). The
   module will be called atyfb.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
+
+ATI Rage128 display support (EXPERIMENTAL)
+CONFIG_FB_ATY128
+  This driver supports graphics boards with the ATI Rage128 chips.
+  Say Y if you have such a graphics board.
+
+  The driver is also available as a module ( = code which can be
+  inserted and removed from the running kernel whenever you want). The
+  module will be called aty128fb.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
   
 PowerMac "control" frame buffer device support
 CONFIG_FB_CONTROL
@@ -2770,7 +2809,7 @@ CONFIG_INET
 
   For an excellent introduction to Linux networking, please read the
   NET-3-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -2998,7 +3037,7 @@ CONFIG_IP_ALIAS
   connect to you. This is called "multihosting" or "virtual domains"
   or "virtual hosting services" and is explained in the
   Virtual-Services-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -3172,7 +3211,7 @@ CONFIG_IPX
   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
+  http://www.linuxdoc.org/docs.html#howto ). In order to do the
   former, you'll also have to say Y to "NCP filesystem support",
   below.
 
@@ -3185,7 +3224,7 @@ CONFIG_IPX
   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 available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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 .
@@ -3206,7 +3245,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
-  http://metalab.unc.edu/mdw/linux.html#howto for details.
+  http://www.linuxdoc.org/docs.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
@@ -3236,7 +3275,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
-  http://metalab.unc.edu/mdw/linux.html#howto for details.
+  http://www.linuxdoc.org/docs.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).
@@ -3305,7 +3344,7 @@ CONFIG_ATALK
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto , contains valuable
+  http://www.linuxdoc.org/docs.html#howto , contains valuable
   information as well.
 
   This driver is also available as a module ( = code which can be
@@ -3393,7 +3432,7 @@ 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
   and the HAM-HOWTO and the AX25-HOWTO, both available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -3417,7 +3456,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . You might also want to
+  http://www.linuxdoc.org/docs.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 .
@@ -3453,7 +3492,7 @@ CONFIG_NETROM
   A comprehensive listing of all the software for Linux amateur radio
   users as well as information about how to configure an AX.25 port is
   contained in the AX25-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . You also might want to
+  http://www.linuxdoc.org/docs.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 .
@@ -3472,7 +3511,7 @@ CONFIG_ROSE
   A comprehensive listing of all the software for Linux amateur radio
   users as well as information about how to configure an AX.25 port is
   contained in the AX25-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . You also might want to
+  http://www.linuxdoc.org/docs.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 .
@@ -3538,7 +3577,7 @@ CONFIG_DMASCC
   (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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -3561,7 +3600,7 @@ 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 from http://metalab.unc.edu/mdw/linux.html#howto . Also
+  available from http://www.linuxdoc.org/docs.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
@@ -3820,7 +3859,7 @@ CONFIG_BRIDGE
   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 .
+  http://www.linuxdoc.org/docs.html#howto .
 
   The Bridging code is still in test. If unsure, say N.
 
@@ -4092,7 +4131,7 @@ CONFIG_SCSI
   port version of the 100 MB IOMEGA ZIP drive.
 
   Please read the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . The
+  http://www.linuxdoc.org/docs.html#howto . The
   SCSI-Programming-HOWTO contains information about how to add or
   remove an SCSI device from a running Linux machine without
   rebooting.
@@ -4110,7 +4149,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . This is NOT for SCSI
+  http://www.linuxdoc.org/docs.html#howto . This is NOT for SCSI
   CDROMs.
 
   This driver is also available as a module ( = code which can be
@@ -4126,7 +4165,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto , and
+  http://www.linuxdoc.org/docs.html#howto , and
   drivers/scsi/README.st in the kernel source. This is NOT for SCSI
   CDROMs.
 
@@ -4140,7 +4179,7 @@ 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 at
-  http://metalab.unc.edu/mdw/linux.html#howto . Also make sure to say Y
+  http://www.linuxdoc.org/docs.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
@@ -4168,7 +4207,7 @@ CONFIG_CHR_DEV_SG
   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
+  http://www.linuxdoc.org/docs.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
@@ -4244,7 +4283,7 @@ CONFIG_SCSI_AHA152X
   must be manually specified in this case.
 
   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
+  http://www.linuxdoc.org/docs.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
@@ -4256,7 +4295,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . Note that Trantor was
+  http://www.linuxdoc.org/docs.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.
@@ -4270,7 +4309,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  http://www.linuxdoc.org/docs.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/aha1740.h.
 
@@ -4305,7 +4344,7 @@ CONFIG_SCSI_AIC7XXX
   configuration options. You should read drivers/scsi/README.aic7xxx
   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
+  http://www.linuxdoc.org/docs.html#howto , can also be of great
   help.
 
   If you want to compile this driver as a module ( = code which can be
@@ -4418,7 +4457,7 @@ BusLogic SCSI support
 CONFIG_SCSI_BUSLOGIC
   This is support for BusLogic MultiMaster and FlashPoint SCSI Host
   Adapters. Consult the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto , and the files
+  http://www.linuxdoc.org/docs.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
@@ -4441,7 +4480,7 @@ DTC3180/3280 SCSI support
 CONFIG_SCSI_DTC3280
   This is support for DTC 3180/3280 SCSI Host Adapters. Please read
   the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto , and the file
+  http://www.linuxdoc.org/docs.html#howto , and the file
   drivers/scsi/README.dtc3x80.
 
   This driver is also available as a module ( = code which can be
@@ -4458,7 +4497,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
-  from http://metalab.unc.edu/mdw/linux.html#howto .
+  from http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4472,7 +4511,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 from http://metalab.unc.edu/mdw/linux.html#howto . 
+  available from http://www.linuxdoc.org/docs.html#howto . 
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4486,7 +4525,7 @@ CONFIG_SCSI_U14_34F
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . Note that there is also
+  http://www.linuxdoc.org/docs.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.
@@ -4521,7 +4560,7 @@ CONFIG_SCSI_FUTURE_DOMAIN
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   NOTE: Newer Adaptec AHA-2920C boards use the Adaptec AIC-7850 chip
   and should use the aic7xxx driver ("Adaptec AIC7xxx chipset SCSI
@@ -4551,7 +4590,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  http://www.linuxdoc.org/docs.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/g_NCR5380.h.
 
@@ -4580,7 +4619,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  http://www.linuxdoc.org/docs.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.
@@ -4802,7 +4841,7 @@ CONFIG_SCSI_IBMMCA
   bootparam" or see the documentation of your boot loader about how to
   pass options to the kernel. The lilo procedure is also explained in
   the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4880,7 +4919,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4891,7 +4930,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  http://www.linuxdoc.org/docs.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/pas16.h.
   
@@ -4904,7 +4943,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be 
   inserted in and removed from the running kernel whenever you want),
@@ -4915,7 +4954,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -4926,7 +4965,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -4937,7 +4976,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -4956,7 +4995,7 @@ CONFIG_SCSI_QLOGIC_FAS
 
   Information about this driver is contained in
   drivers/scsi/README.qlogicfas. You should also read the SCSI-HOWTO,
-  available from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4974,7 +5013,7 @@ CONFIG_SCSI_QLOGIC_ISP
 
   Please read the file drivers/scsi/README.qlogicisp. You should also
   read the SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4994,7 +5033,7 @@ Seagate ST-02 and Future Domain TMC-8xx SCSI support
 CONFIG_SCSI_SEAGATE
   These are 8-bit SCSI controllers; the ST-01 is also supported by
   this driver. It is explained in section 3.9 of the SCSI-HOWTO,
-  available from http://metalab.unc.edu/mdw/linux.html#howto . If it
+  available from http://www.linuxdoc.org/docs.html#howto . If it
   doesn't work out of the box, you may have to change some settings in
   drivers/scsi/seagate.h.
 
@@ -5007,7 +5046,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  http://www.linuxdoc.org/docs.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.
@@ -5022,7 +5061,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If it doesn't work out
+  http://www.linuxdoc.org/docs.html#howto . If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/ultrastor.h.
   
@@ -5063,7 +5102,7 @@ CONFIG_SCSI_EATA
 
   You want to read the start of drivers/scsi/eata.c and the
   SCSI-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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.
@@ -5103,7 +5142,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -5166,7 +5205,7 @@ AM53/79C974 PCI SCSI support
 CONFIG_SCSI_AM53C974
   This is support for the AM53/79C974 SCSI host adapters. Please read
   drivers/scsi/README.AM53C974 for details. Also, the SCSI-HOWTO,
-  available from http://metalab.unc.edu/mdw/linux.html#howto , is for
+  available from http://www.linuxdoc.org/docs.html#howto , is for
   you.
 
   Note that there is another driver for AM53C974 based adapters:
@@ -5216,7 +5255,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . If you use this driver,
+  http://www.linuxdoc.org/docs.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.
@@ -5368,7 +5407,7 @@ CONFIG_NETDEVICES
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto ) or dialing up a shell
+  http://www.linuxdoc.org/docs.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
@@ -5428,7 +5467,7 @@ CONFIG_SLIP
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto , explains how to
+  http://www.linuxdoc.org/docs.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
@@ -5452,7 +5491,7 @@ CONFIG_SLIP_COMPRESSED
   ftp://metalab.unc.edu/pub/Linux/system/network/serial/ ) which allows
   you to use SLIP over a regular dial up shell connection, you
   definitely want to say Y here. The NET-3-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto , explains how to
+  http://www.linuxdoc.org/docs.html#howto , explains how to
   configure CSLIP. This won't enlarge your kernel.
 
 Keepalive and linefill
@@ -5481,7 +5520,7 @@ CONFIG_PPP
 
   To use PPP, you need an additional program called pppd as described
   in Documentation/networking/ppp.txt and in the PPP-HOWTO, available
-  at http://metalab.unc.edu/mdw/linux.html#howto . If you upgrade
+  at http://www.linuxdoc.org/docs.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.
 
@@ -5601,7 +5640,7 @@ CONFIG_WAVELAN
 
   If you want to use an ISA WaveLAN card under Linux, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . Some more specific
+  http://www.linuxdoc.org/docs.html#howto . Some more specific
   information is contained in Documentation/networking/wavelan.txt and
   in the source code drivers/net/wavelan.p.h.
 
@@ -5905,7 +5944,7 @@ CONFIG_PLIP
 
   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
+  http://www.linuxdoc.org/docs.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.
@@ -5928,7 +5967,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
-  from http://metalab.unc.edu/mdw/linux.html#howto .
+  from http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6454,7 +6493,7 @@ CONFIG_WANPIPE_PPP
 Cyclom 2X(tm) multiprotocol cards (EXPERIMENTAL)
 CONFIG_CYCLADES_SYNC
   Cyclom 2X from Cyclades Corporation (http://www.cyclades.com and
-  http://www.cyclades.com.br ) is an intelligent multiprotocol WAN
+  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
@@ -6470,7 +6509,7 @@ CONFIG_CYCLADES_SYNC
   Feel free to contact me or the cycsyn-devel mailing list at
   acme@conectiva.com.br and cycsyn-devel@bazar.conectiva.com.br for
   additional details, I hope to have documentation available as soon
-  as possible.
+  as possible (Cyclades Brazil is writing the Documentation).
 
   The driver will be compiled as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6503,7 +6542,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . You will then also have
+  http://www.linuxdoc.org/docs.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
@@ -6530,7 +6569,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -6541,7 +6580,7 @@ WD80*3 support
 CONFIG_WD80x3
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6553,7 +6592,7 @@ SMC Ultra MCA support
 CONFIG_ULTRAMCA
   If you have a network (Ethernet) card of this type and are running
   an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
-  available from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6565,7 +6604,7 @@ SMC Ultra support
 CONFIG_ULTRA
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
   
   Important: There have been many reports that, with some motherboards
   mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
@@ -6584,7 +6623,7 @@ SMC Ultra32 EISA support
 CONFIG_ULTRA32
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6599,7 +6638,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
-  from http://metalab.unc.edu/mdw/linux.html#howto .
+  from http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you
@@ -6613,7 +6652,7 @@ CONFIG_NE2K_PCI
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6637,7 +6676,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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.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
@@ -6648,7 +6687,7 @@ NI5010 support (EXPERIMENTAL)
 CONFIG_NI5010
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . Note that this is still
+  http://www.linuxdoc.org/docs.html#howto . Note that this is still
   experimental code.
 
   This driver is also available as a module ( = code which can be
@@ -6661,7 +6700,7 @@ NI5210 support
 CONFIG_NI52
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6673,7 +6712,7 @@ NI6510 support
 CONFIG_NI65
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6686,7 +6725,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6796,7 +6835,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . Some LinkSys cards are
+  http://www.linuxdoc.org/docs.html#howto . Some LinkSys cards are
   of this type.
 
   If you want to compile this driver as a module ( = code which can be
@@ -6808,7 +6847,7 @@ CONFIG_LANCE
 CONFIG_NET_VENDOR_3COM
   If you have a network (Ethernet) card belonging to this class, say Y
   and read the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -6819,7 +6858,7 @@ CONFIG_NET_VENDOR_3COM
 CONFIG_EL1
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . Also, consider buying a
+  http://www.linuxdoc.org/docs.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.
@@ -6834,7 +6873,7 @@ CONFIG_EL1
 CONFIG_EL2
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6847,7 +6886,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6859,7 +6898,7 @@ CONFIG_ELPLUS
 CONFIG_EL16
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6871,7 +6910,7 @@ CONFIG_EL16
 CONFIG_ELMC
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6883,7 +6922,7 @@ CONFIG_ELMC
 CONFIG_ELMC_II
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6895,7 +6934,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
-  from http://metalab.unc.edu/mdw/linux.html#howto .
+  from http://www.linuxdoc.org/docs.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
@@ -6912,7 +6951,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . More specific
+  http://www.linuxdoc.org/docs.html#howto . More specific
   information is in Documentation/networking/vortex.txt and in the
   comments at the beginning of drivers/net/3c59x.c.
 
@@ -6927,7 +6966,7 @@ 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 from http://metalab.unc.edu/mdw/linux.html#howto . 
+  available from http://www.linuxdoc.org/docs.html#howto . 
 
   If unsure, say Y.
 
@@ -6947,7 +6986,7 @@ CONFIG_ARCNET
   support" below.
 
   You might also want to have a look at the Ethernet-HOWTO, available
-  from http://metalab.unc.edu/mdw/linux.html#howto (even though ARCnet
+  from http://www.linuxdoc.org/docs.html#howto (even though ARCnet
   is not really Ethernet).
 
   This driver is also available as a module ( = code which can be
@@ -7035,7 +7074,7 @@ Cabletron E21xx support
 CONFIG_E2100
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7048,7 +7087,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto as well as
+  http://www.linuxdoc.org/docs.html#howto as well as
   Documentation/networking/cs89x0.txt.
 
   If you want to compile this as a module ( = code which can be
@@ -7061,7 +7100,7 @@ DEPCA support
 CONFIG_DEPCA
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto as well as
+  http://www.linuxdoc.org/docs.html#howto as well as
   drivers/net/depca.c.
 
   If you want to compile this as a module ( = code which can be
@@ -7076,7 +7115,7 @@ CONFIG_EWRK3
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7088,7 +7127,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7100,7 +7139,7 @@ AT1700/1720 support
 CONFIG_AT1700
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7113,7 +7152,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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.
@@ -7129,7 +7168,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7141,7 +7180,7 @@ EtherExpress support
 CONFIG_EEXPRESS
   If you have an EtherExpress16 network (Ethernet) card, say Y and
   read the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . Note that the Intel
+  http://www.linuxdoc.org/docs.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.
@@ -7156,7 +7195,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7168,7 +7207,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7180,7 +7219,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7192,7 +7231,7 @@ NE2000/NE1000 support
 CONFIG_NE2000
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . Many Ethernet cards
+  http://www.linuxdoc.org/docs.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
@@ -7211,13 +7250,13 @@ SK_G16 support
 CONFIG_SK_G16
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7244,7 +7283,7 @@ 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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.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
@@ -7256,7 +7295,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7268,7 +7307,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7280,7 +7319,7 @@ Mylex EISA LNE390A/LNE390B support (EXPERIMENTAL)
 CONFIG_LNE390
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7292,7 +7331,7 @@ Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)
 CONFIG_NE3210
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . Note that this driver
+  http://www.linuxdoc.org/docs.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
@@ -7305,7 +7344,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7319,7 +7358,7 @@ CONFIG_DE4X5
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . More specific
+  http://www.linuxdoc.org/docs.html#howto . More specific
   information is contained in Documentation/networking/de4x5.txt.
 
   This driver is also available as a module ( = code which can be
@@ -7337,7 +7376,7 @@ CONFIG_DEC_ELCP
   (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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . More specific
+  http://www.linuxdoc.org/docs.html#howto . More specific
   information is contained in Documentation/networking/tulip.txt.
 
   This driver is also available as a module ( = code which can be
@@ -7352,7 +7391,7 @@ CONFIG_DGRS
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . More specific
+  http://www.linuxdoc.org/docs.html#howto . More specific
   information is contained in Documentation/networking/dgrs.txt.
 
   This driver is also available as a module ( = code which can be
@@ -7365,7 +7404,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7377,7 +7416,7 @@ ICL EtherTeam 16i/32 support (EXPERIMENTAL)
 CONFIG_ETH16I
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7390,7 +7429,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   Devices currently supported by this driver are Compaq Netelligent,
   Compaq NetFlex and Olicom cards. Please read the file
@@ -7402,7 +7441,7 @@ CONFIG_TLAN
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-  Please email feedback to james.banks@caldera.com.
+  Please email feedback to torben.mathiasen@compaq.com.
 
 VIA Rhine support
 CONFIG_VIA_RHINE
@@ -7419,7 +7458,7 @@ Racal-Interlan EISA ES3210 support (EXPERIMENTAL)
 CONFIG_ES3210
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7431,7 +7470,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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7450,13 +7489,13 @@ CONFIG_ZNET
   (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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
 Adaptec Starfire support
 CONFIG_ADAPTEC_STARFIRE
   If you have an Ethernet network card like this, say Y and read the
   Ethernet-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7469,7 +7508,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -7489,7 +7528,7 @@ AT-LAN-TEC/RealTek pocket adapter support
 CONFIG_ATP
   This is a network (Ethernet) device which attaches to your parallel
   port. Read drivers/net/atp.c as well as the Ethernet-HOWTO,
-  available from http://metalab.unc.edu/mdw/linux.html#howto , if you
+  available from http://www.linuxdoc.org/docs.html#howto , if you
   want to use this. If you intend to use this driver, you should have
   said N to the Parallel Printer support, because the two drivers
   don't like each other.
@@ -7499,7 +7538,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto , if you want to use
+  http://www.linuxdoc.org/docs.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.
@@ -7532,14 +7571,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
-  from http://metalab.unc.edu/mdw/linux.html#howto . Most people can
+  from http://www.linuxdoc.org/docs.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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   Warning: this driver will almost definitely fail if more than one
   active Token Ring card is present. 
@@ -7557,7 +7596,7 @@ CONFIG_IBMOL
 
   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 .
+  http://www.linuxdoc.org/docs.html#howto .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7579,7 +7618,7 @@ CONFIG_TMS380TR
 
   If you have such an adapter and would like to use it, say Y or M and
   read the Token-Ring mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
   Also read the file linux/Documentation/networking/tms380tr.txt or check
   http://www.auk.cx/tms380tr/
@@ -7591,7 +7630,7 @@ CONFIG_SMCTR
 
   If you have such an adapter and would like to use it, say Y or M and
   read the Token-Ring mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
 Traffic Shaper (EXPERIMENTAL)
 CONFIG_SHAPER
@@ -7682,7 +7721,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -7949,10 +7988,10 @@ CONFIG_QUOTA
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto . Probably the quota
+  http://www.linuxdoc.org/docs.html#howto . Probably the quota
   support is only useful for multi user systems. If unsure, say N.
 
-Support for USB (EXPERIMENTAL)
+Support for USB
 CONFIG_USB
   Universal Serial Bus (USB) is a specification for a serial bus
   subsystem which offers higher speeds and more features than the
@@ -7976,7 +8015,7 @@ CONFIG_USB
   The module will be called usbcore.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-UHCI (intel PIIX4, VIA, and others) support?
+UHCI (intel PIIX4, VIA, ...) 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
@@ -7992,17 +8031,17 @@ CONFIG_USB_UHCI
   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-HCD (Compaq, iMacs, OPTi, SiS, ALi, and others) support?
+OHCI-HCD (Compaq, iMacs, OPTi, SiS, ALi, ...) support?
 CONFIG_USB_OHCI_HCD
   The Open Host Controller Interface is a standard by
   Compaq/Microsoft/National 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 - like SiS (aktual 610, 610 and so on) or ALi (ALi IV, ALi V,
-  Aladin Pro..) - conform to this standard.
+  non-Intel architectures and on several x86 compatibles with non-Intel
+  chipsets - like SiS (actual 610, 610 and so on) or ALi (ALi IV, ALi V,
+  Aladdin Pro..) - conform to this standard.
 
-  You may want to read the file drivers/usb/README.ohci_hcd.
+  You may want to read the file Documentation/usb/ohci-hcd.txt.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -8027,6 +8066,19 @@ CONFIG_USB_MOUSE
   USB mouse and prefer to use the mouse in its limited Boot Protocol
   mode. This driver is much smaller than the HID one.
 
+Wacom Graphire tablet support
+CONFIG_USB_GRAPHIRE
+  Say Y here if you want to use the USB version of the Wacom
+  Graphire tablet. Make sure you select Mouse and Event support,
+  don't select HID support, because this driver collides with it.
+  Use HIDBP support for keyboards and mice instead if you need it.
+
+Logitech WingMan Force joystick support
+CONFIG_USB_WMFORCE
+  Say Y here if you want to use the Logitech WingMan Force with Linux
+  on the USB port. No force-feedback support yet, but other than that,
+  it should work like a normal joystick.
+
 Keyboard support
 CONFIG_INPUT_KEYBDEV
   Say Y here if you want your USB HID keyboard to be able to serve as
@@ -8055,29 +8107,18 @@ CONFIG_INPUT_EVDEV
   under /dev/inputX (misc 64+) in a generic way.
   This is the future ...
 
-USB HID debug output
-CONFIG_USB_HID_DEBUG
-  Say Y here if you want to see what the HID driver is doing,
-  perhaps it's doing something wrong with your device.
-
-USB HID lots of debug output
-CONFIG_USB_HID_DEBUG_LOTS
-  Say Y here if you don't fear to read all the HID dumps the
-  HID driver will generate when you switch this on. Really LOTS
-  of debug output.
-
-USB scanner support
+USB Scanner support
 CONFIG_USB_SCANNER
   Say Y here if you want to connect a USB scanner to your
-  computer's USB port. Please read drivers/usb/README.scanner
-  and drivers/usb/README.scanner_hp_sane for more information.
+  computer's USB port. Please read Documentation/usb/scanner.txt
+  and Documentation/usb/scanner-hp-sane.txt for more information.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called hp_scanner.o. If you want to compile it as
   a module, say M here and read Documentation/modules.txt.
 
-USB audio parsing support
+USB Audio support
 CONFIG_USB_AUDIO
   Say Y here if you want to connect USB audio equipment such as
   speakers to your computer's USB port.
@@ -8087,28 +8128,55 @@ CONFIG_USB_AUDIO
   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)
+USB Modem (CDC ACM) support
 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 driver supports USB modems and ISDN adapters which support the
+  Communication Device Class Abstract Control Model interface.
 
   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 serial converter support
+USB Serial converter support
 CONFIG_USB_SERIAL
   Say Y here if you want to connect a Connect Tech WhiteHEAT 
   multi-port USB to serial converter; a Belkin, Peracom, or eTek
   single port USB to serial converter; or a Handspring Visor.
+  Please read Documentation/usb/usb-serial.txt for more information.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called usb-serial.o. If you want to compile it 
   as a module, say M here and read Documentation/modules.txt.
 
+USB Generic Serial Driver
+CONFIG_USB_SERIAL_GENERIC
+  Say Y here if you want to use the generic USB serial driver.
+  Please read Documentation/usb/usb-serial.txt for more information
+  on using this driver. It is recommended that the USB Serial
+  Driver be compiled as a module for this driver to be used properly.
+
+USB ConnectTech WhiteHEAT Serial Driver
+CONFIG_USB_SERIAL_WHITEHEAT
+  Say Y here if you want to use a ConnectTech WhiteHEAT 4 port
+  USB to serial converter device.
+
+USB Handspring Visor Driver
+CONFIG_USB_SERIAL_VISOR
+  Say Y here if you want to connect to your HandSpring Visor through
+  its USB docking station.
+
+USB Belkin Single Port Serial Driver
+CONFIG_USB_SERIAL_BELKIN
+  Say Y here if you want to use a Belkin single port USB to serial 
+  converter device.
+  
+USB Peracom Single Port Serial Driver
+CONFIG_USB_SERIAL_PERACOM
+  Say Y here if you want to use a Peracom single port USB to serial 
+  converter device.
+
 USB Printer support
 CONFIG_USB_PRINTER
   Say Y here if you want to connect a USB printer to your computer's USB
@@ -8132,12 +8200,9 @@ CONFIG_USB_CPIA
 USB OV511 Camera support
 CONFIG_USB_OV511
   Say Y here if you want to connect this type of camera to your
-  computer's USB port. See drivers/usb/README.ov511 for more
+  computer's USB port. See Documentation/usb/ov511.txt for more
   information and for a list of supported cameras.
   
-  NOTE: This code is experimental and you will not get video with it
-  yet.
-
   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 ov511.o. If you want to compile it as a
@@ -8146,7 +8211,7 @@ CONFIG_USB_OV511
 USB Kodak DC-2xx Camera support
 CONFIG_USB_DC2XX
   Say Y here if you want to connect this type of still camera to
-  your computer's USB port.  See drivers/usb/README.dc2xx for more
+  your computer's USB port.  See Documentation/usb/dc2xx.txt for more
   information; some non-Kodak cameras may also work with this
   driver, given application support (such as www.gPhoto.org).
 
@@ -8155,7 +8220,7 @@ CONFIG_USB_DC2XX
   The module will be called dc2xx.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-USB SCSI Support
+USB SCSI (mass storage) support
 CONFIG_USB_SCSI
   Say Y here if you want to connect USB mass storage devices to your
   computer's USB port.
@@ -8170,9 +8235,6 @@ 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
@@ -8200,14 +8262,16 @@ CONFIG_USB_USS720
   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 support
-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.
+USB device filesystem
+CONFIG_USB_DEVICEFS
+  This file system implements a "devices" file, that lists
+  the currently connected to your USB busses, a "drivers" file
+  that lists the USB kernel client drivers currently loaded,
+  and for every connected device a file named "xxx/yyy", where
+  xxx is the bus number and yyy the device number, that can be used
+  by userspace drivers to talk to the device.
 
-  Note that you must say Y to global "/proc filesystem support" under
-  Filesystems for this to work.
+  Most users want to say Y here.
 
 DABUSB driver
 CONFIG_USB_DABUSB
@@ -8220,7 +8284,7 @@ CONFIG_USB_DABUSB
   inserted in and removed from the running kernel whenever you want).
   The module will be called dabusb.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
-  
+ 
 ACPI support
 CONFIG_ACPI
   Advanced Configuration and Power Interface (ACPI) is an interface
@@ -8265,7 +8329,7 @@ CONFIG_EXT2_FS
   by about 44 kB.
 
   The Ext2fs-Undeletion mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto , gives information about
+  http://www.linuxdoc.org/docs.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
@@ -8315,7 +8379,7 @@ CONFIG_ISO9660_FS
   If you have a CDROM drive and want to do more with it than just
   listen to audio CDs and watch its LEDs, say Y (and read
   Documentation/filesystems/isofs.txt and the CDROM-HOWTO, available
-  from http://metalab.unc.edu/mdw/linux.html#howto ), thereby
+  from http://www.linuxdoc.org/docs.html#howto ), thereby
   enlarging your kernel by about 27 KB; otherwise say N.
 
   If you want to compile this as a module ( = code which can be
@@ -8394,7 +8458,7 @@ CONFIG_MSDOS_FS
   they are compressed; to access compressed MSDOS partitions under
   Linux, you can either use the DOS emulator DOSEMU, described in the
   DOSEMU-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto , or try dmsdosfs in
+  http://www.linuxdoc.org/docs.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
@@ -8691,11 +8755,11 @@ CONFIG_ROMFS_FS
   If you don't know whether you need it, then you don't need it:
   answer N.
 
-QNX filesystem support (read only) (EXPERIMENTAL)
+QNX4 filesystem support (read only) (EXPERIMENTAL)
 CONFIG_QNX4FS_FS  
   This is the filesystem used by the operating system QNX 4. Say Y if
   you intend to mount QNX hard disks or floppies. Unless you say Y to
-  "QNXFS read-write support" below, you will only be able to read
+  "QNX4FS write support" below, you will only be able to read
   these filesystems.
 
   This filesystem support is also available as a module ( = code which
@@ -8703,11 +8767,12 @@ CONFIG_QNX4FS_FS
   want). The module is called qnx4.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt. 
 
-  If unsure, say N.
+  If you don't know whether you need it, then you don't need it:
+  answer N.
 
-QNXFS write support (DANGEROUS)
+QNX4FS write support (DANGEROUS)
 CONFIG_QNX4FS_RW
-  Say Y if you want to test write support for QNX filesystems.
+  Say Y if you want to test write support for QNX4 filesystems.
 
 Kernel automounter support
 CONFIG_AUTOFS_FS
@@ -8908,7 +8973,7 @@ CONFIG_SMB_FS
   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
-  from http://metalab.unc.edu/mdw/linux.html#howto .
+  from http://www.linuxdoc.org/docs.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
@@ -8953,7 +9018,7 @@ 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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  IPX-HOWTO from http://www.linuxdoc.org/docs.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.
@@ -9394,7 +9459,7 @@ CONFIG_VT_CONSOLE
   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 .)
+  http://www.linuxdoc.org/docs.html#howto .)
 
   If unsure, say Y.
 
@@ -9458,7 +9523,7 @@ CONFIG_SERIAL_CONSOLE
   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 .)
+  http://www.linuxdoc.org/docs.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
@@ -9709,7 +9774,7 @@ CONFIG_PRINTER
   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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -9724,7 +9789,7 @@ CONFIG_PRINTER
   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"
+  http://www.linuxdoc.org/docs.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
@@ -9750,7 +9815,7 @@ CONFIG_BUSMOUSE
   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 , and say Y here.
+  http://www.linuxdoc.org/docs.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
@@ -9773,7 +9838,7 @@ CONFIG_MOUSE
   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
+  http://www.linuxdoc.org/docs.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
@@ -9790,7 +9855,7 @@ CONFIG_LOGIBUSMOUSE
   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 from http://metalab.unc.edu/mdw/linux.html#howto .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -9810,7 +9875,7 @@ CONFIG_PSMOUSE
 
   Although PS/2 mice are not technically bus mice, they are explained
   in detail in the Busmouse-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -9823,7 +9888,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.html#howto .
 
 PC110 digitizer pad support
 CONFIG_PC110_PAD
@@ -9841,7 +9906,7 @@ 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 from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -9857,7 +9922,7 @@ 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 .
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -9871,7 +9936,7 @@ CONFIG_ATIXL_BUSMOUSE
   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 .
+  http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -10303,7 +10368,7 @@ CONFIG_APM
 
   Supporting software is available; for more information, read the
   Battery Powered Linux mini-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto .
+  http://www.linuxdoc.org/docs.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
@@ -10766,7 +10831,7 @@ CONFIG_SOUND
   interrupt and DMA channel), because you will be asked for it. 
 
   You want to read the Sound-HOWTO, available from
-  http://metalab.unc.edu/mdw/linux.html#howto . General information
+  http://www.linuxdoc.org/docs.html#howto . General information
   about the modular sound system is contained in the files
   Documentation/sound/Introduction. The file
   Documentation/sound/README.OSS contains some slightly outdated but
@@ -11177,7 +11242,7 @@ 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 from http://metalab.unc.edu/mdw/linux.html#howto for more
+  available from http://www.linuxdoc.org/docs.html#howto for more
   info.
 
 Gallant's Audio Excel DSP 16 support (SC-6000 and SC-6600)
@@ -11856,6 +11921,84 @@ CONFIG_SUN_MOSTEK_RTC
 ### Please someone fill these in.
 ###
 
+IEEE 1394 (aka FireWire) support
+CONFIG_IEEE1394
+  IEEE 1394 describes a high performance serial bus, which is also
+  known as FireWire(tm) or i.Link(tm) and is used for connecting all
+  sorts of devices (most notably digital video cameras).
+
+  If you have FireWire hardware and want to use it, say Y here.  This
+  is the core support only, you will also need to select a driver for
+  your IEEE 1394 adapter.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called ieee1394.o.
+
+  FireWire is a trademark by Apple Inc. and i.Link is a trademark by 
+  Sony.
+
+TI PCILynx IEEE 1394 support
+CONFIG_IEEE1394_PCILYNX
+  Say Y here if you have a IEEE-1394 controller with the Texas
+  Instruments PCILynx chip.  Note: this driver is written for revision
+  2 of this chip and may not work with revision 0.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called pcilynx.o.
+
+Use local RAM on PCILynx board
+CONFIG_IEEE1394_PCILYNX_LOCALRAM
+  This option makes the PCILynx driver use local RAM available on some
+  PCILynx setups for Packet Control Lists.  Local RAM may speed up
+  command processing because no PCI transfers are necessary during 
+  use of the Packet Control Lists.
+  
+  Note that there are no known PCILynx systems providing local RAM
+  except for the evaluation boards by Texas Instruments and that the
+  PCILynx does not reliably report missing RAM.
+  
+  Unless you are absolutely sure that you have 64kB of local RAM and
+  that you want to use it or if you don't know what this is all about,
+  say N here.
+
+Adaptec AIC-5800 IEEE 1394 support
+CONFIG_IEEE1394_AIC5800
+  Say Y here if you have a IEEE 1394 controller using the Adaptec
+  AIC-5800 chip. All Adaptec host adapters (89xx series) use this
+  chip, as well as miro's DV boards.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called aic5800.o.
+
+OHCI (Open Host Controller Interface) support
+CONFIG_IEEE1394_OHCI1394
+  Say Y here if you have a IEEE 1394 controller based on OHCI.
+  The current driver was only tested with OHCI chipsets made
+  by Texas Instruments. However, most third-party vendors use
+  TI chips.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called ohci1394.o.
+
+RAW IEEE 1394 I/O support
+CONFIG_IEEE1394_RAWIO
+  Say Y here if you want support for the raw device. This is generally
+  a good idea, so you should say Y here. The raw device enables
+  direct communication of user programs to the IEEE 1394 bus.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called raw1394.o.
+
 #
 # m68k-specific kernel options
 # Documented by Chris Lawrence <quango@themall.net> et al.
@@ -12376,10 +12519,11 @@ CONFIG_DIO
 
 Processor Type
 CONFIG_6xx
-  There are two types of PowerPC chips supported. The more common
-  types (601,603,604,740,750) and the embedded versions (821 and 860).
-  Unless you are building a kernel for one of the embedded boards
-  using the 821 or 860 choose 6xx.
+  There are three types of PowerPC chips supported. The more common
+  types (601, 603, 604, 740, 750), the Motorola embedded versions (821,
+  823, 850, 855, 860), and the IBM embedded versions (403 and 405).
+  Unless you are building a kernel for one of the embedded processor
+  systems, choose 6xx.
 
 Machine Type
 CONFIG_PMAC
@@ -12876,7 +13020,7 @@ CONFIG_1GB
   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 .)
+  SCSI-HOWTO, available from http://www.linuxdoc.org/docs.html#howto .)
 
 Math emulation
 CONFIG_NWFPE
@@ -13034,7 +13178,7 @@ 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 at http://metalab.unc.edu/mdw/linux.html#howto .
+  IR-HOWTO, available at http://www.linuxdoc.org/docs.html#howto .
 
   This support is also available as a module. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
@@ -13624,7 +13768,7 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  ACTiSYS Dongle dongle dongles esi actisys IrMate tekram BVM MVME
 # LocalWords:  BVME BVME WRITETHROUGH copyback writethrough fwmark syncookie tu
 # LocalWords:  alphalinux GOBIOS csn chemnitz nat ACARD AMI MegaRAID megaraid
-# LocalWords:  QNXFS ISI isicom xterms Apollos VPN RCPCI rcpci sgi visws pcmcia
+# LocalWords:  QNX4FS ISI isicom xterms Apollos VPN RCPCI rcpci sgi visws pcmcia
 # LocalWords:  IrLPT UIRCC Tecra Strebel jstrebel suse Eichwalder ke INI INIA
 # LocalWords:  FCP qlogicfc sym isapnp DTLK DoubleTalk rcsys dtlk DMAP SGIVW ar
 # LocalWords:  dmabuf EcoRadio MUTEFREQ GIrBIL girbil tepkom vol mha diplom PQS
diff --git a/Documentation/README.moxa b/Documentation/README.moxa
new file mode 100644
index 000000000..20600ad32
--- /dev/null
+++ b/Documentation/README.moxa
@@ -0,0 +1,18 @@
+ ===================================================================	
+ Release Note of Linux Driver for Moxa's C104/C168/CI-104J
+ ===================================================================	
+
+ -------------------------------------------------------------------
+ Ver. 1.1  				               Sep.  1, 1999
+ -------------------------------------------------------------------
+ 1. Improved:
+   a. Static driver (kernel) and dynamic driver (loadable module) 
+      modes are supported.
+   b. Multiple Smartio PCI series boards sharing the same IRQ 
+      supported.
+
+ -------------------------------------------------------------------
+ Ver. 1.0  				               Feb  17, 1997
+ -------------------------------------------------------------------
+ 1. Newly release.
+
diff --git a/Documentation/computone.txt b/Documentation/computone.txt
index 9d39a878a..65937a736 100644
--- a/Documentation/computone.txt
+++ b/Documentation/computone.txt
@@ -7,7 +7,7 @@ These notes are for the drivers which have already been integrated into the
 kernel and have been tested on Linux kernels 2.0, 2.2, and 2.3.
 
 Version: 1.2.4
-Date: 08/04/99
+Date: 12/15/99
 Author: Andrew Manison <amanison@america.net>
 Testing: larryg@computone.com
 Support: support@computone.com
@@ -28,7 +28,7 @@ with the exception of the MicroChannel controllers.  It does not support
 products previous to the Intelliport II.
 
 This driver was developed on the v2.0.x Linux tree and has been tested up
-to v2.2.9; it will probably not work with earlier v1.X kernels,.
+to v2.2.13; it will probably not work with earlier v1.X kernels,.
 
 
 2. QUICK INSTALLATION
@@ -204,9 +204,94 @@ does not match the standard serial port's behaviour please let us know.
 
 7. ip2mkdev shell script
 
-===== Cut Here ===== 
-#!/bin/sh -
+Previously, this script was simply attached here.  It is now attached as a
+shar archive to make it easier to extract the script from the documentation.
+To create the ip2mkdev shell script change to a convenient directory (/tmp
+works just fine) and run the following command:
+
+	unshar /usr/src/linux/Documentation/computone.txt
+		(This file)
+
+You should now have a file ip2mkdev in your current working directory with
+permissions set to execute.  Running that script with then create the
+necessary devices for the Computone boards, interfaces, and ports which
+are present on you system at the time it is run.
+
 
+#!/bin/sh
+# This is a shell archive (produced by GNU sharutils 4.2).
+# To extract the files from this archive, save it to some FILE, remove
+# everything before the `!/bin/sh' line above, then type `sh FILE'.
+#
+# Made on 1999-12-17 16:06 EST by <root@alcove.wittsend.com>.
+# Source directory was `/mnt2/src/linux-2.3.33/Documentation'.
+#
+# Existing files will *not* be overwritten unless `-c' is specified.
+#
+# This shar contains:
+# length mode       name
+# ------ ---------- ------------------------------------------
+#   3300 -rwxr-xr-x ip2mkdev
+#
+save_IFS="${IFS}"
+IFS="${IFS}:"
+gettext_dir=FAILED
+locale_dir=FAILED
+first_param="$1"
+for dir in $PATH
+do
+  if test "$gettext_dir" = FAILED && test -f $dir/gettext \
+     && ($dir/gettext --version >/dev/null 2>&1)
+  then
+    set `$dir/gettext --version 2>&1`
+    if test "$3" = GNU
+    then
+      gettext_dir=$dir
+    fi
+  fi
+  if test "$locale_dir" = FAILED && test -f $dir/shar \
+     && ($dir/shar --print-text-domain-dir >/dev/null 2>&1)
+  then
+    locale_dir=`$dir/shar --print-text-domain-dir`
+  fi
+done
+IFS="$save_IFS"
+if test "$locale_dir" = FAILED || test "$gettext_dir" = FAILED
+then
+  echo=echo
+else
+  TEXTDOMAINDIR=$locale_dir
+  export TEXTDOMAINDIR
+  TEXTDOMAIN=sharutils
+  export TEXTDOMAIN
+  echo="$gettext_dir/gettext -s"
+fi
+touch -am 1231235999 $$.touch >/dev/null 2>&1
+if test ! -f 1231235999 && test -f $$.touch; then
+  shar_touch=touch
+else
+  shar_touch=:
+  echo
+  $echo 'WARNING: not restoring timestamps.  Consider getting and'
+  $echo "installing GNU \`touch', distributed in GNU File Utilities..."
+  echo
+fi
+rm -f 1231235999 $$.touch
+#
+if mkdir _sh06360; then
+  $echo 'x -' 'creating lock directory'
+else
+  $echo 'failed to create lock directory'
+  exit 1
+fi
+# ============= ip2mkdev ==============
+if test -f 'ip2mkdev' && test "$first_param" != -c; then
+  $echo 'x -' SKIPPING 'ip2mkdev' '(file already exists)'
+else
+  $echo 'x -' extracting 'ip2mkdev' '(text)'
+  sed 's/^X//' << 'SHAR_EOF' > 'ip2mkdev' &&
+#!/bin/sh -
+X
 #	ip2mkdev
 #
 #	Make or remove devices as needed for Computone Intelliport drivers
@@ -227,117 +312,134 @@ does not match the standard serial port's behaviour please let us know.
 #
 if test ! -f /proc/tty/drivers
 then
-	echo "\
+X	echo "\
 Unable to check driver status.
 Make sure proc file system is mounted."
-
-	exit 255
+X
+X	exit 255
 fi
-
+X
 if test ! -f /proc/tty/driver/ip2
 then
-	echo "\
+X	echo "\
 Unable to locate ip2 proc file.
 Attempting to load driver"
-
-	if insmod ip2
-	then
-		if test ! -f /proc/tty/driver/ip2
-		then
-			echo "\
+X
+X	if /sbin/insmod ip2
+X	then
+X		if test ! -f /proc/tty/driver/ip2
+X		then
+X			echo "\
 Unable to locate ip2 proc file after loading driver.
 Driver initialization failure or driver version error.
 "
-		exit 255
-		fi
-	else
-		echo "Unable to load ip2 driver."
-		exit 255
-	fi
+X		exit 255
+X		fi
+X	else
+X		echo "Unable to load ip2 driver."
+X		exit 255
+X	fi
 fi
-
+X
 # Ok...  So we got the driver loaded and we can locate the procfs files.
 # Next we need our major numbers.
-
+X
 TTYMAJOR=`sed -e '/^ip2/!d' -e '/\/dev\/tty/!d' -e 's/.*tty.[ 	]*\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/drivers`
 CUAMAJOR=`sed -e '/^ip2/!d' -e '/\/dev\/cu/!d' -e 's/.*cu.[ 	]*\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/drivers`
 BRDMAJOR=`sed -e '/^Driver: /!d' -e 's/.*IMajor=\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/driver/ip2`
-
+X
 echo "\
 TTYMAJOR = $TTYMAJOR
 CUAMAJOR = $CUAMAJOR
 BRDMAJOR = $BRDMAJOR
 "
-
+X
 # Ok...  Now we should know our major numbers, if appropriate...
 # Now we need our boards and start the device loops.
-
+X
 grep '^Board [0-9]:' /proc/tty/driver/ip2 | while read token number type alltherest
 do
-	# The test for blank "type" will catch the stats lead-in lines
-	# if they exist in the file
-	if test "$type" = "vacant" -o "$type" = "Vacant" -o "$type" = ""
-	then
-		continue
-	fi
-
-	BOARDNO=`expr "$number" : '\([0-9]\):'`
-	PORTS=`expr "$alltherest" : '.*ports=\([0-9]*\)' | tr ',' ' '`
-	MINORS=`expr "$alltherest" : '.*minors=\([0-9,]*\)' | tr ',' ' '`
-
-	if test "$BOARDNO" = "" -o "$PORTS" = ""
-	then
+X	# The test for blank "type" will catch the stats lead-in lines
+X	# if they exist in the file
+X	if test "$type" = "vacant" -o "$type" = "Vacant" -o "$type" = ""
+X	then
+X		continue
+X	fi
+X
+X	BOARDNO=`expr "$number" : '\([0-9]\):'`
+X	PORTS=`expr "$alltherest" : '.*ports=\([0-9]*\)' | tr ',' ' '`
+X	MINORS=`expr "$alltherest" : '.*minors=\([0-9,]*\)' | tr ',' ' '`
+X
+X	if test "$BOARDNO" = "" -o "$PORTS" = ""
+X	then
 #	This may be a bug.  We should at least get this much information
-		echo "Unable to process board line"
-		continue
-	fi
-
-	if test "$MINORS" = ""
-	then
+X		echo "Unable to process board line"
+X		continue
+X	fi
+X
+X	if test "$MINORS" = ""
+X	then
 #	Silently skip this one.  This board seems to have no boxes
-		continue
-	fi
-
-	echo "board $BOARDNO: $type ports = $PORTS; port numbers = $MINORS"
-
-	if test "$BRDMAJOR" != ""
-	then
-		BRDMINOR=`expr $BOARDNO \* 4`
-		STSMINOR=`expr $BRDMINOR + 1`
-		if test ! -c /dev/ip2ipl$BOARDNO ; then
-			mknod /dev/ip2ipl$BOARDNO c $BRDMAJOR $BRDMINOR
-		fi
-		if test ! -c /dev/ip2stat$BOARDNO ; then
-			mknod /dev/ip2stat$BOARDNO c $BRDMAJOR $STSMINOR
-		fi
-	fi
-
-	if test "$TTYMAJOR" != ""
-	then
-		PORTNO=$BOARDBASE
-
-		for PORTNO in $MINORS
-		do
-			if test ! -c /dev/ttyF$PORTNO ; then
-				# We got the harware but no device - make it
-				mknod /dev/ttyF$PORTNO c $TTYMAJOR $PORTNO
-			fi	
-		done
-	fi
-
-	if test "$CUAMAJOR" != ""
-	then
-		PORTNO=$BOARDBASE
-
-		for PORTNO in $MINORS
-		do
-			if test ! -c /dev/cuf$PORTNO ; then
-				# We got the harware but no device - make it
-				mknod /dev/cuf$PORTNO c $CUAMAJOR $PORTNO
-			fi	
-		done
-	fi
+X		continue
+X	fi
+X
+X	echo "board $BOARDNO: $type ports = $PORTS; port numbers = $MINORS"
+X
+X	if test "$BRDMAJOR" != ""
+X	then
+X		BRDMINOR=`expr $BOARDNO \* 4`
+X		STSMINOR=`expr $BRDMINOR + 1`
+X		if test ! -c /dev/ip2ipl$BOARDNO ; then
+X			mknod /dev/ip2ipl$BOARDNO c $BRDMAJOR $BRDMINOR
+X		fi
+X		if test ! -c /dev/ip2stat$BOARDNO ; then
+X			mknod /dev/ip2stat$BOARDNO c $BRDMAJOR $STSMINOR
+X		fi
+X	fi
+X
+X	if test "$TTYMAJOR" != ""
+X	then
+X		PORTNO=$BOARDBASE
+X
+X		for PORTNO in $MINORS
+X		do
+X			if test ! -c /dev/ttyF$PORTNO ; then
+X				# We got the harware but no device - make it
+X				mknod /dev/ttyF$PORTNO c $TTYMAJOR $PORTNO
+X			fi	
+X		done
+X	fi
+X
+X	if test "$CUAMAJOR" != ""
+X	then
+X		PORTNO=$BOARDBASE
+X
+X		for PORTNO in $MINORS
+X		do
+X			if test ! -c /dev/cuf$PORTNO ; then
+X				# We got the harware but no device - make it
+X				mknod /dev/cuf$PORTNO c $CUAMAJOR $PORTNO
+X			fi	
+X		done
+X	fi
 done
-
+X
+Xexit 0
+SHAR_EOF
+  $shar_touch -am 1217160599 'ip2mkdev' &&
+  chmod 0755 'ip2mkdev' ||
+  $echo 'restore of' 'ip2mkdev' 'failed'
+  if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
+  && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
+    md5sum -c << SHAR_EOF >/dev/null 2>&1 \
+    || $echo 'ip2mkdev:' 'MD5 check failed'
+eccd181f4a2005e47a969fc83885df61  ip2mkdev
+SHAR_EOF
+  else
+    shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'ip2mkdev'`"
+    test 3300 -eq "$shar_count" ||
+    $echo 'ip2mkdev:' 'original size' '3300,' 'current size' "$shar_count!"
+  fi
+fi
+rm -fr _sh06360
 exit 0
-===== Cut Here ===== 
diff --git a/Documentation/fb/aty128fb.txt b/Documentation/fb/aty128fb.txt
new file mode 100644
index 000000000..c1c574b42
--- /dev/null
+++ b/Documentation/fb/aty128fb.txt
@@ -0,0 +1,72 @@
+[This file is cloned from VesaFB/matroxfb]
+
+What is aty128fb?
+=================
+
+This is a driver for a graphic framebuffer for ATI Rage128 based devices
+on Intel and PPC boxes.
+
+Advantages:
+
+ * It provides a nice large console (128 cols + 48 lines with 1024x768)
+   without using tiny, unreadable fonts.
+ * You can run XF68_FBDev on top of /dev/fb0
+ * Most important: boot logo :-)
+
+Disadvantages:
+
+ * graphic mode is slower than text mode... but you should not notice
+   if you use same resolution as you used in textmode.
+ * still experimental.
+
+
+How to use it?
+==============
+
+Switching modes is done using the  video=aty128fb:<resolution>... modedb
+boot parameter or using `fbset' program.
+
+See Documentation/fb/modedb.txt for more information on modedb
+resolutions.
+
+You should compile in both vgacon (to boot if you remove your Rage128 from
+box) and aty128fb (for graphics mode). You should not compile-in vesafb
+unless you have primary display on non-Rage128 VBE2.0 device (see 
+Documentation/vesafb.txt for details).
+
+
+X11
+===
+
+XF68_FBDev should generally work fine, but it is non-accelerated. As of
+this document, 8 and 32bpp works fine.  There have been palette issues
+when switching from X to console and back to X.  You will have to restart
+X to fix this.
+
+
+Configuration
+=============
+
+You can pass kernel command line options to vesafb with
+`video=aty128fb:option1,option2:value2,option3' (multiple options should
+be separated by comma, values are separated from options by `:'). 
+Accepted options:
+
+noaccel  - do not use acceleration engine. It is default.
+accel    - use acceleration engine. Not finished.
+vmode:x  - chooses PowerMacintosh video mode <x>. Depreciated.
+cmode:x  - chooses PowerMacintosh colour mode <x>. Depreciated.
+<XxX@X>  - selects startup videomode. See modedb.txt for detailed
+	   explanation. Default is 640x480x8bpp.
+
+
+Limitations
+===========
+
+There are known and unknown bugs, features and misfeatures.
+Currently there are following known bugs:
+ + This driver is still experimental and is not finished.  Too many
+   bugs/eratta to list here.
+
+--
+Brad Douglas <brad@neruo.com>
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt
index c36c76f03..e8c51d1b5 100644
--- a/Documentation/fb/framebuffer.txt
+++ b/Documentation/fb/framebuffer.txt
@@ -29,9 +29,9 @@ By convention, the following device nodes are used (numbers indicate the device
 minor numbers):
 
       0 = /dev/fb0	First frame buffer
-     32 = /dev/fb1	Second frame buffer
+      1 = /dev/fb1	Second frame buffer
 	  ...
-    224 = /dev/fb7	8th frame buffer
+     31 = /dev/fb31	32nd frame buffer
 
 For backwards compatibility, you may want to create the following symbolic
 links:
diff --git a/Documentation/filesystems/cramfs.txt b/Documentation/filesystems/cramfs.txt
index a408b8828..9bbee1613 100644
--- a/Documentation/filesystems/cramfs.txt
+++ b/Documentation/filesystems/cramfs.txt
@@ -11,3 +11,43 @@ diskspace than traditional filesystems.
 You can't write to a cramfs filesystem (making it compressible and
 compact also makes it _very_ hard to update on-the-fly), so you have to
 create the disk image with the "mkcramfs" utility in scripts/cramfs.
+
+
+Usage Notes
+-----------
+
+File sizes are limited to less than 16MB.
+
+Maximum filesystem size is a little over 256MB.  (The last file on the
+filesystem is allowed to extend past 256MB.)  (Comments in mkcramfs.c
+suggest that ROM sizes may be limited to 64MB, though that's not a
+limitation in cramfs code.)
+
+Only the low 8 bits of gid are stored.  The current version of
+mkcramfs simply truncates to 8 bits, which is a potential security
+issue.
+
+Hard links are not supported, but symlinks are.  (See also the TODO
+comment in mkcramfs.c at the nlink test.)
+
+Cramfs directories have no `.' or `..' entries.  Directories (like
+every other file on cramfs) always have a link count of 1.  (There's
+no need to use -noleaf in `find', btw.)
+
+No timestamps are stored in a cramfs, so these default to the epoch
+(1970 GMT).  Recently-accessed files may have updated timestamps, but
+the update lasts only as long as the inode is cached in memory, after
+which the timestamp reverts to 1970, i.e. moves backwards in time.
+
+Currently, cramfs must be written and read with architectures of the
+same endianness, and can be read only by kernels with PAGE_CACHE_SIZE
+== 4096.  At least the latter of these is a bug, but it hasn't been
+decided what the best fix is.  For the moment if you have larger pages
+you can just change the #define in mkcramfs.c, so long as you don't
+mind the filesystem becoming unreadable to future kernels.
+
+
+Hacker Notes
+------------
+
+See fs/cramfs/README for filesystem layout and implementation notes.
diff --git a/Documentation/highuid.txt b/Documentation/highuid.txt
new file mode 100644
index 000000000..ce7c17b7b
--- /dev/null
+++ b/Documentation/highuid.txt
@@ -0,0 +1,79 @@
+Notes on the change from 16-bit UIDs to 32-bit UIDs:
+
+- kernel code MUST take into account __kernel_uid_t and __kernel_uid32_t
+  when communicating between user and kernel space in an ioctl or data
+  structure.
+
+- kernel code should use uid_t and gid_t in kernel-private structures and
+  code.
+
+What's left to be done for 32-bit UIDs on all Linux architectures:
+
+- Disk quotas have an interesting limitation that is not related to the
+  maximum UID/GID. They are limited by the maximum file size on the
+  underlying filesystem, because quota records are written at offsets
+  corresponding to the UID in question.
+  Further investigation is needed to see if the quota system can cope
+  properly with huge UIDs. If it can deal with 64-bit file offsets on all 
+  architectures, this should not be a problem.
+
+- Decide whether or not to keep backwards compatibility with the system
+  accounting file, or if we should break it as the comments suggest
+  (currently, the old 16-bit UID and GID are still written to disk, and
+  part of the former pad sparce is used to store separate 32-bit UID and
+  GID)
+
+- Need to validate that OS emulation calls the 16-bit UID
+  compatibility syscalls, if the OS being emulated used 16-bit UIDs, or
+  uses the 32-bit UID system calls properly otherwise.
+
+  This affects at least:
+	SunOS emulation
+	Solaris emulation
+	iBCS on Intel
+
+	sparc32 emulation on sparc64
+	(need to support whatever new 32-bit UID system calls are added to
+	sparc32)
+
+- Validate that all filesystems behave properly.
+
+  At present, 32-bit UIDs _should_ work for:
+	ext2
+	ufs
+	isofs
+	nfs
+	coda
+	udf
+
+  Ioctl() fixups have been made for:
+	ncpfs
+	smbfs
+
+  Filesystems with simple fixups to prevent 16-bit UID wraparound:
+	minix
+	sysv
+	qnx4
+
+  Other filesystems have not been checked yet.
+
+- The ncpfs and smpfs filesystems can not presently use 32-bit UIDs in
+  all ioctl()s. Some new ioctl()s have been added with 32-bit UIDs, but
+  more are needed. (as well as new user<->kernel data structures)
+
+- The ELF core dump format only supports 16-bit UIDs on arm, i386, m68k,
+  sh, and sparc32. Fixing this is probably not that important, but would
+  require adding a new ELF section.
+
+- The ioctl()s used to control the in-kernel NFS server only support
+  16-bit UIDs on arm, i386, m68k, sh, and sparc32.
+
+- make sure that the UID mapping feature of AX25 networking works properly
+  (it should be safe because it's always used a 32-bit integer to
+  communicate between user and kernel)
+
+
+Chris Wing
+wingc@umich.edu
+
+last updated: January 11, 2000
diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index 4f10e114e..74e56b75f 100644
--- a/Documentation/ide.txt
+++ b/Documentation/ide.txt
@@ -1,4 +1,4 @@
-ide.txt -- Information regarding the Enhanced IDE drive in Linux 2.1/2.2
+ide.txt -- Information regarding the Enhanced IDE drive in Linux 2.2/2.3/2.4
 ===============================================================================
 
    +-----------------------------------------------------------------+
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index f78256a27..8f76009c5 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -1,15 +1,14 @@
 
-   
- INDEX OF DOCUMENTATION FOR PEOPLE INTERESTED IN WRITING AND/OR UNDERSTANDING
-                               THE LINUX KERNEL.
-                                       
-		Juan-Mariano de Goyeneche <jmseyas@dit.upm.es>
-   
-   
-   /*
-    * The latest version of this document may be found at: 
-    *   http://www.dit.upm.es/~jmseyas/linux/kernel/hackers-docs.html
-    */
+       Index of Documentation for People Interested in Writing and/or
+                                      
+                      Understanding the Linux Kernel.
+                                      
+              Juan-Mariano de Goyeneche < jmseyas@dit.upm.es>
+                                      
+/*
+ * The latest version of this document may be found at:
+ *   http://www.dit.upm.es/~jmseyas/linux/kernel/hackers-docs.html
+ */
 
    The need for a document like this one became apparent in the
    linux-kernel mailing list as the same questions, asking for pointers
@@ -31,301 +30,409 @@
    corrections, ideas or comments are also welcomed.
    
    The papers that follow are listed in no particular order. All are
-   catalogued with the following fields: the document's "Title", the
-   "Author"/s, the "URL" where they can be found, some "Keywords"
-   helpful when searching for specific topics, and a brief "Description"
-   of the Document.
+   cataloged with the following fields: the document's "Title", the
+   "Author"/s, the "URL" where they can be found, some "Keywords" helpful
+   when searching for specific topics, and a brief "Description" of the
+   Document.
    
    Enjoy!
    
+     ON-LINE DOCS:
+       
+     * Title: "The Linux Kernel"
+       Author: David A. Rusling.
+       URL: http://sunsite.unc.edu/linux/LDP/tlk/tlk.html
+       Keywords: everything!, book.
+       Description: On line, 200 pages book describing most aspects of
+       the Linux Kernel. Probably, the first reference for beginners.
+       Lots of illustrations explaining data structures use and
+       relationships in the purest Richard W. Stevens' style. Contents:
+       "1.-Hardware Basics, 2.-Software Basics, 3.-Memory Management,
+       4.-Processes, 5.-Interprocess Communication Mechanisms, 6.-PCI,
+       7.-Interrupts and Interrupt Handling, 8.-Device Drivers, 9.-The
+       File system, 10.-Networks, 11.-Kernel Mechanisms, 12.-Modules,
+       13.-The Linux Kernel Sources, A.-Linux Data Structures, B.-The
+       Alpha AXP Processor, C.-Useful Web and FTP Sites, D.-The GNU
+       General Public License, Glossary". In short: a must have.
+       
+     * Title: "The Linux Kernel Hackers' Guide"
+       Author: Michael K.Johnson and others.
+       URL: http://khg.redhat.com/HyperNews/get/khg.html
+       Keywords: everything!
+       Description: No more Postscript book-like version. Only HTML now.
+       Many people have contributed. The interface is similar to web
+       available mailing lists archives. You can find some articles and
+       then some mails asking questions about them and/or complementing
+       previous contributions. A little bit anarchic in this aspect, but
+       with some valuable information in some cases.
+       
+     * Title: "Conceptual Architecture of the Linux Kernel"
+       Author: Ivan T. Bowman.
+       URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a1.html
+       Keywords: conceptual software arquitecture, extracted design,
+       reverse engineering, system structure.
+       Description: Conceptual software arquitecture of the Linux kernel,
+       automatically extracted from the source code. Very detailed. Good
+       figures. Gives good overall kernel understanding.
+       
+     * Title: "Concrete Architecture of the Linux Kernel"
+       Author: Ivan T. Bowman, Saheem Siddiqi, and Meyer C. Tanuan.
+       URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a2.html
+       Keywords: concrete arquitecture, extracted design, reverse
+       engineering, system structure, dependencies.
+       Description: Concrete arquitecture of the Linux kernel,
+       automatically extracted from the source code. Very detailed. Good
+       figures. Gives good overall kernel understanding. This papers
+       focus on lower details than its predecessor (files, variables...).
+       
+     * Title: "Linux as a Case Study: Its Extracted Software
+       Architecture"
+       Author: Ivan T. Bowman, Richard C. Holt and Neil V. Brewster.
+       URL: http://plg.uwaterloo.ca/~itbowman/papers/linuxcase.html
+       Keywords: software architecture, architecture recovery,
+       redocumentation.
+       Description: Paper appeared at ICSE'99, Los Angeles, May 16-22,
+       1999. A mixture of the previous two documents from the same
+       author.
+       
+     * Title: "Overview of the Virtual File System"
+       Author: Richard Gooch.
+       URL: http://www.atnf.csiro.au/~rgooch/linux/vfs.txt
+       Keywords: VFS, File System, mounting filesystems, opening files,
+       dentries,
+       dcache. Description: Brief introduction to the Linux Virtual File
+       System. What is it, how it works, operations taken when opening a
+       file or mounting a file system and description of important data
+       structures explaining the purpose of each of their entries.
+       
+     * Title: "The Linux RAID-1, 4, 5 Code"
+       Author: Ingo Molnar, Gadi Oxman and Miguel de Icaza.
+       URL: http://www.ssc.com/lj/issue44/2391.html
+       Keywords: RAID, MD driver.
+       Description: Linux Journal Kernel Korner article. Here is it's
+       abstract: "A description of the implementation of the RAID-1,
+       RAID-4 and RAID-5 personalities of the MD device driver in the
+       Linux kernel, providing users with high performance and reliable,
+       secondary-storage capability using software".
+       
+     * Title: "Dynamic Kernels: Modularized Device Drivers"
+       Author: Alessandro Rubini.
+       URL: http://www.ssc.com/lj/issue23/1219.html
+       Keywords: device driver, module, loading/unloading modules,
+       allocating resources.
+       Description: Linux Journal Kernel Korner article. Here is it's
+       abstract: "This is the first of a series of four articles
+       co-authored by Alessandro Rubini and Georg Zezchwitz which present
+       a practical approach to writing Linux device drivers as kernel
+       loadable modules. This installment presents an introduction to the
+       topic, preparing the reader to understand next month's
+       installment".
+       
+     * Title: "Dynamic Kernels: Discovery"
+       Author: Alessandro Rubini.
+       URL: http://www.ssc.com/lj/issue24/kk24.html
+       Keywords: character driver, init_module, clean_up module,
+       autodetection,
+       mayor number, minor number, file operations, open(), close().
+       Description: Linux Journal Kernel Korner article. Here is it's
+       abstract: "This article, the second of four, introduces part of
+       the actual code to create custom module implementing a character
+       device driver. It describes the code for module initialization and
+       cleanup, as well as the open() and close() system calls".
+       
+     * Title: "The Devil's in the Details"
+       Author: Georg v. Zezschwitz and Alessandro Rubini.
+       URL: http://www.ssc.com/lj/issue25/kk25.html
+       Keywords: read(), write(), select(), ioctl(), blocking/non
+       blocking mode, interrupt handler.
+       Description: Linux Journal Kernel Korner article. Here is it's
+       abstract: "This article, the third of four on writing character
+       device drivers, introduces concepts of reading, writing, and using
+       ioctl-calls".
+       
+     * Title: "Dissecting Interrupts and Browsing DMA"
+       Author: Alessandro Rubini and Georg v. Zezschwitz.
+       URL: http://www.ssc.com/lj/issue26/interrupt.html
+       Keywords: interrupts, irqs, DMA, bottom halves, task queues.
+       Description: Linux Journal Kernel Korner article. Here is it's
+       abstract: "This is the fourth in a series of articles about
+       writing character device drivers as loadable kernel modules. This
+       month, we further investigate the field of interrupt handling.
+       Though it is conceptually simple, practical limitations and
+       constraints make this an ``interesting'' part of device driver
+       writing, and several different facilities have been provided for
+       different situations. We also investigate the complex topic of
+       DMA".
+       
+     * Title: "Network Buffers And Memory Management"
+       Author: Alan Cox.
+       URL: http://www.ssc.com/lj/issue30/kk30.html
+       Keywords: sk_buffs, network devices, protocol/link layer
+       variables, network devices flags, transmit, receive,
+       configuration, multicast.
+       Description: Linux Journal Kernel Korner. Here is the abstract:
+       "Writing a network device driver for Linux is fundamentally
+       simple---most of the complexity (other than talking to the
+       hardware) involves managing network packets in memory".
+       
+     * Title: "An Introduction to the Linux 1.3.x Networking Code"
+       Author: Vipul Gupta.
+       URL: http://anchor.cs.binghamton.edu/courses/cs628/linux-net.html
+       Keywords: files, sk_buffs.
+       Description: A short description of files under the net/
+       directory. Each file has a one or two lines paragraph description.
+       sk_buffs explained, too, with some beautiful pictures. A little
+       bit outdated.
+       
+     * Title: "Linux ioctl() Primer"
+       Author: Vipul Gupta.
+       URL: http://anchor.cs.binghamton.edu/courses/cs628/ioctl.html
+       Keywords: ioctl, socket.
+       Description: Little description and examples on the use and
+       implementation of the ioctl() system call. A little bit biased
+       towards sockets.
+       
+     * Title: "Writing Linux Device Drivers"
+       Author: Michael K. Johnson.
+       URL: http://www.redhat.com/~johnsonm/devices.html
+       Keywords: files, VFS, file operations, kernel interface, character
+       vs block devices, I/O access, hardware interrupts, DMA, access to
+       user memory, memory allocation, timers.
+       Description: Introductory 50-minutes (sic) tutorial on writing
+       device drivers. 12 pages written by the same author of the "Kernel
+       Hackers' Guide" which give a very good overview of the topic.
+       
+     * Title: "The Venus kernel interface"
+       Author: Peter J. Braam.
+       URL:
+       http://www.coda.cs.cmu.edu/doc/html/kernel-venus-protocol.html
+       Keywords: coda, filesystem, venus, cache manager.
+       Description: "This document describes the communication between
+       Venus and kernel level file system code needed for the operation
+       of the Coda filesystem. This version document is meant to describe
+       the current interface (version 1.0) as well as improvements we
+       envisage".
+       
+     * Title: "Programming PCI-Devices under Linux"
+       Author: Claus Schroeter.
+       URL:
+       ftp://ftp.llp.fu-berlin.de/pub/linux/LINUX-LAB/whitepapers/pcip.ps
+       .gz
+       Keywords: PCI, device, busmastering.
+       Description: 6 pages tutorial on PCI programming under Linux.
+       Gives the basic concepts on the architecture of the PCI subsystem,
+       as long as basic functions and macros to read/write the devices
+       and perform busmastering.
+       
+     * Title: "Writing Character Device Driver for Linux"
+       Author: R. Baruch and C. Schroeter.
+       URL:
+       ftp://ftp.llp.fu-berlin.de/pub/linux/LINUX-LAB/whitepapers/drivers
+       .ps.gz
+       Keywords: character device drivers, I/O, signals, DMA, accesing
+       ports in user space, kernel environment.
+       Description: 68 pages paper on writing character drivers. A little
+       bit old (1.993, 1.994) although still useful.
+       
+     * Title: "The Second Extended Filesystem"
+       Author: Matthew Wilcox.
+       URL: http://pocket.fluff.org/~mrw/linux/ext2.txt
+       Keywords: ext2, filesystem.
+       Description: Description of ext2's blocks, directories, inodes ...
+       
+     * Title: "Analysis of the Ext2fs structure"
+       Author: Louis-Dominique Dubeau.
+       URL: http://step.polymtl.ca/~ldd/ext2fs/ext2fs_toc.html
+       Keywords: ext2, filesystem, ext2fs.
+       Description: Description of ext2's blocks, directories, inodes,
+       bitmaps, invariants ...
+       
+     * Title: "Kernel API changes from 2.0 to 2.2"
+       Author: Richard Gooch.
+       URL:
+       http://www.atnf.csiro.au/~rgooch/linux/docs/porting-to-2.2.html
+       Keywords: 2.2, changes.
+       Description: Kernel functions/structures/variables which changed
+       from 2.0.x to 2.2.x.
+       
+     * Title: "Kernel API changes from 2.2 to 2.3"
+       Author: Richard Gooch.
+       URL:
+       http://www.atnf.csiro.au/~rgooch/linux/docs/porting-to-2.2.html
+       Keywords: 2.3, changes.
+       Description: Kernel functions/structures/variables which changed
+       from 2.2.x to 2.3.x.
+       
+     * Title: "Linux Kernel Module Programming Guide"
+       Author: Ori Pomerantz.
+       URL: http://www.linuxdoc.org/LDP/lkmpg/mpg.html
+       Keywords: modules, GPL book, /proc, ioctls, system calls,
+       interrupt handlers .
+       Description: Very nice 92 pages GPL book on the topic of modules
+       programming. Lots of examples.
+       
+     * Title: "Device File System (devfs) Overview"
+       Author: Richard Gooch.
+       URL: http://www.atnf.csiro.au/~rgooch/linux/docs/devfs.txt
+       Keywords: filesystem, /dev, devfs, dynamic devices, major/minor
+       allocation, device management.
+       Description: Document describing Richard Gooch's controversial
+       devfs, which allows for dynamic devices, only shows present
+       devices in /dev, gets rid of major/minor numbers allocation
+       problems, and allows for hundreds of identical devices (which some
+       USB systems might demand soon).
+       
+     * Title: "I/O Event Handling Under Linux"
+       Author: Richard Gooch.
+       URL: http://www.atnf.csiro.au/~rgooch/linux/docs/io-events.html
+       Keywords: IO, I/O, select(2), poll(2), FDs, aio_read(2), readiness
+       event queues.
+       Description: From the Introduction: "I/O Event handling is about
+       how your Operating System allows you to manage a large number of
+       open files (file descriptors in UNIX/POSIX, or FDs) in your
+       application. You want the OS to notify you when FDs become active
+       (have data ready to be read or are ready for writing). Ideally you
+       want a mechanism that is scalable. This means a large number of
+       inactive FDs cost very little in memory and CPU time to manage".
+       
+     BOOKS: (Not on-line)
    
-   ON-LINE DOCS:
-   
-          + Title: "The Linux Kernel"
-            Author: David A. Rusling.
-            URL: http://sunsite.unc.edu/linux/LDP/tlk/tlk.html
-            Keywords: everything!, book.
-            Description: On line, 200 pages book describing most
-            aspects of the Linux Kernel. Probably, the first reference
-            for beginners. Lots of illustrations explaining data
-            structures use and relationships in the purest Richard W.
-            Stevens' style. Contents: "1.-Hardware Basics, 2.-Software
-            Basics, 3.-Memory Management, 4.-Processes, 5.-Interprocess
-            Communication Mechanisms, 6.-PCI, 7.-Interrupts and Interrupt
-            Handling, 8.-Device Drivers, 9.-The File system,
-            10.-Networks, 11.-Kernel Mechanisms, 12.-Modules, 13.-The
-            Linux Kernel Sources, A.-Linux Data Structures, B.-The Alpha
-            AXP Processor, C.-Useful Web and FTP Sites, D.-The GNU
-            General Public License, Glossary". In short: a must have.
-   
-          + Title: "The Linux Kernel Hackers' Guide"
-            Author: Michael K.Johnson and others.
-            URL: http://www.redhat.com:8080/HyperNews/get/khg.html
-            Keywords: everything!
-            Description: No more Postscript book-like version. Only
-            HTML now. Many people have contributed. The interface is
-            similar to web available mailing lists archives. You can find
-            some articles and then some mails asking questions about them
-            and/or complementing previous contributions. A little bit
-            anarchic in this aspect, but with some valuable information
-            in some cases.
-       
-          + Title: "Tour Of the Linux Kernel Source"
-            Author: Vijo Cherian.
-            URL: http://www.svrec.ernet.in/~vijo/tolks/tolks.html
-            Keywords:
-            Description: The name says it all. A tour of the sources,
-            describing directories, files, variables, data structures...
-            It covers general stuff, device drivers, filesystems, IPC and
-            Network Code.
-       
-          + Title: "Overview of the Virtual File System"
-            Author: Richard Gooch.
-            URL: http://www.atnf.csiro.au/~rgooch/linux/vfs.txt
-            Keywords: VFS, File System, mounting filesystems, opening
-            files, dentries,
-            dcache. Description: Brief introduction to the Linux
-            Virtual File System. What is it, how it works, operations
-            taken when opening a file or mounting a file system and
-            description of important data structures explaining the
-            purpose of each of their entries.
-   
-          + Title: "The Linux RAID-1, 4, 5 Code"
-            Author: Ingo Molnar, Gadi Oxman and Miguel de Icaza.
-            URL: http://www.ssc.com/lj/issue44/2391.html
-            Keywords: RAID, MD driver.
-            Description: Linux Journal Kernel Korner article. Here is
-            it's abstract: "A description of the implementation of the
-            RAID-1, RAID-4 and RAID-5 personalities of the MD device
-            driver in the Linux kernel, providing users with high
-            performance and reliable, secondary-storage capability using
-            software".
-   
-          + Title: "Dynamic Kernels: Modularized Device Drivers"
-            Author: Alessandro Rubini.
-            URL: http://www.ssc.com/lj/issue23/1219.html
-            Keywords: device driver, module, loading/unloading modules,
-            allocating
-            resources. Description: Linux Journal Kernel Korner
-            article. Here is it's abstract: "This is the first of a
-            series of four articles co-authored by Alessandro Rubini and
-            Georg Zezchwitz which present a practical approach to writing
-            Linux device drivers as kernel loadable modules. This
-            installment presents an introduction to the topic, preparing
-            the reader to understand next month's installment".
-   
-          + Title: "Dynamic Kernels: Discovery"
-            Author: Alessandro Rubini.
-            URL: http://www.ssc.com/lj/issue24/kk24.html
-            Keywords: character driver, init_module, clean_up module,
-            autodetection,
-            mayor number, minor number, file operations, open(), close().
-            Description: Linux Journal Kernel Korner article. Here is
-            it's abstract: "This article, the second of four, introduces
-            part of the actual code to create custom module implementing
-            a character device driver. It describes the code for module
-            initialization and cleanup, as well as the open() and close()
-            system calls".
-   
-          + Title: "The Devil's in the Details"
-            Author: Georg v. Zezschwitz and Alessandro Rubini.
-            URL: http://www.ssc.com/lj/issue25/kk25.html
-            Keywords: read(), write(), select(), ioctl(), blocking/non
-            blocking mode,
-            interrupt handler. Description: Linux Journal Kernel Korner
-            article. Here is it's abstract: "This article, the third of
-            four on writing character device drivers, introduces concepts
-            of reading, writing, and using ioctl-calls".
-   
-          + Title: "Dissecting Interrupts and Browsing DMA"
-            Author: Alessandro Rubini and Georg v. Zezschwitz.
-            URL: http://www.ssc.com/lj/issue26/interrupt.html
-            Keywords: interrupts, irqs, DMA, bottom halves, task
-            queues.
-            Description: Linux Journal Kernel Korner article. Here is
-            it's abstract: "This is the fourth in a series of articles
-            about writing character device drivers as loadable kernel
-            modules. This month, we further investigate the field of
-            interrupt handling. Though it is conceptually simple,
-            practical limitations and constraints make this an
-            ``interesting'' part of device driver writing, and several
-            different facilities have been provided for different
-            situations. We also investigate the complex topic of DMA".
-   
-          + Title: "Network Buffers And Memory Management"
-            Author: Alan Cox.
-            URL: http://www.ssc.com/lj/issue30/kk30.html
-            Keywords: sk_buffs, network devices, protocol/link layer
-            variables, network
-            devices flags, transmit, receive, configuration, multicast.
-            Description: Linux Journal Kernel Korner. Here is the
-            abstract: "Writing a network device driver for Linux is
-            fundamentally simple---most of the complexity (other than
-            talking to the hardware) involves managing network packets in
-            memory".
-       
-          + Title: "An Introduction to the Linux 1.3.x Networking Code"
-            Author: Vipul Gupta.
-            URL:
-            http://anchor.cs.binghamton.edu/courses/cs628/linux-net.html
-            Keywords: files, sk_buffs.
-            Description: A short description of files under the net/
-            directory. Each file has a one- or two-line paragraph to
-            describe it. Also, sk_buffs is explained with some
-            beautiful pictures. A little bit outdated.
-   
-          + Title: "Linux ioctl() Primer"
-            Author: Vipul Gupta.
-            URL:
-            http://anchor.cs.binghamton.edu/courses/cs628/ioctl.html
-            Keywords: ioctl, socket.
-            Description: Little description and examples on the use and
-            implementation of the ioctl() system call. A little bit
-            biased towards sockets.
-       
-          + Title: "Writing Linux Device Drivers"
-            Author: Michael K. Johnson.
-            URL: http://www.redhat.com/~johnsonm/devices.html
-            Keywords: files, VFS, file operations, kernel interface,
-            character vs
-            block devices, I/O access, hardware interrupts, DMA, access
-            to user memory, memory allocation, timers. Description:
-            Introductory 50-minutes (sic) tutorial on writing device
-            drivers. 12 pages written by the same author of the "Kernel
-            Hackers' Guide" which give a very good overview of the topic.
-   
-          + Title: "The Venus kernel interface"
-            Author: Peter J. Braam.
-            URL:
-            http://www.coda.cs.cmu.edu/doc/html/kernel-venus-protocol.html
-            Keywords: coda, filesystem, venus, cache manager.
-            Description: "This document describes the communication
-            between Venus and kernel level file system code needed for
-            the operation of the Coda filesystem. This version document
-            is meant to describe the current interface (version 1.0) as
-            well as improvements we envisage".
-       
-          + Title: "Programming PCI-Devices under Linux"
-            Author: Claus Schroeter.
-            URL:
-            ftp://ftp.llp.fu-berlin.de/pub/linux/LINUX-LAB/whitepapers/pc
-            ip.ps.gz
-            Keywords: PCI, device, busmastering.
-            Description: 6 pages tutorial on PCI programming under
-            Linux. Gives the basic concepts on the architecture of the
-            PCI subsystem, as long as basic functions and macros to
-            read/write the devices and perform busmastering.
-       
-          + Title: "Writing Character Device Driver for Linux"
-            Author: R. Baruch and C. Schroeter.
-            URL:
-            ftp://ftp.llp.fu-berlin.de/pub/linux/LINUX-LAB/whitepapers/dr
-            ivers.ps.gz
-            Keywords: character device drivers, I/O, signals, DMA,
-            accessing ports in user space, kernel environment.
-            Description: 68 pages paper on writing character drivers. A
-            little bit old (1.993, 1.994) although still useful.
-       
-       
-       
-     * BOOKS: (Not on-line)
-       
-          + Title: "Linux Device Drivers"
-            Author: Alessandro Rubini.
-            Publisher: O'Reilly &Associates.
-            Date: 1998.
-            ISBN: 1-56592-292-1
-       
-          + Title: "Linux Kernel Internals"
-            Author: Michael Beck.
-            Publisher: Addison-Wesley.
-            Date: 1997.
-            ISBN: 0-201-33143-8 (second edition)
-       
-          + Title: "The Design of the UNIX Operating System"
-            Author: Maurice J. Bach.
-            Publisher: Prentice Hall.
-            Date: 1986.
-            ISBN: ???
-   
-          + Title: "The Design and Implementation of the 4.3 BSD UNIX
-            Operating System"
-            Author: Samuel J. Leffler, Marshall Kirk McKusick, Michael
-            J. Karels, John S. Quarterman.
-            Publisher: Addison-Wesley.
-            Date: 1989 (reprinted with corrections on October, 1990).
-            ISBN: 0-201-06196-1
-       
-          + Title: "The Design and Implementation of the 4.4 BSD UNIX
-            Operating System"
-            Author: Marshall Kirk McKusick, Keith Bostic, Michael J.
-            Karels, John S. Quarterman.
-            Publisher: Addison-Wesley.
-            Date: 1996.
-            ISBN: 0-201-54979-4
-   
-          + Title: "Programmation Linux 2.0 API systeme et
-            fonctionnement du noyau"
-            Author: Remy Card, Eric Dumas, Franck Mevel.
-            Publisher: Eyrolles.
-            Date: 1997.
-            Pages: 520. ISBN: 2-212-08932-5
-       
-          + Title: "Unix internals -- the new frontiers"
-            Author: Uresh Vahalia.
-            Publisher: Prentice Hall.
-            Date: 1996.
-            Pages: 600. ISBN: 0-13-101908-2
+     * Title: "Linux Device Drivers"
+       Author: Alessandro Rubini.
+       Publisher: O'Reilly &Associates.
+       Date: 1998.
+       ISBN: 1-56592-292-1
+       
+     * Title: "Linux Kernel Internals"
+       Author: Michael Beck.
+       Publisher: Addison-Wesley.
+       Date: 1997.
+       ISBN: 0-201-33143-8 (second edition)
+       
+     * Title: "The Design of the UNIX Operating System"
+       Author: Maurice J. Bach.
+       Publisher: Prentice Hall.
+       Date: 1986.
+       Pages: 471.
+       ISBN: 0-13-201757-1
+       
+     * Title: "The Design and Implementation of the 4.3 BSD UNIX
+       Operating System"
+       Author: Samuel J. Leffler, Marshall Kirk McKusick, Michael J.
+       Karels, John S. Quarterman.
+       Publisher: Addison-Wesley.
+       Date: 1989 (reprinted with corrections on October, 1990).
+       ISBN: 0-201-06196-1
+       
+     * Title: "The Design and Implementation of the 4.4 BSD UNIX
+       Operating System"
+       Author: Marshall Kirk McKusick, Keith Bostic, Michael J. Karels,
+       John S. Quarterman.
+       Publisher: Addison-Wesley.
+       Date: 1996.
+       ISBN: 0-201-54979-4
+       
+     * Title: "Programmation Linux 2.0 API systeme et fonctionnement du
+       noyau"
+       Author: Remy Card, Eric Dumas, Franck Mevel.
+       Publisher: Eyrolles.
+       Date: 1997.
+       Pages: 520.
+       ISBN: 2-212-08932-5
+       Notes: French.
+       
+     * Title: "The Linux Kernel Book"
+       Author: Remy Card, Eric Dumas, Franck Mevel.
+       Publisher: John Wiley & Sons.
+       Date: 1998.
+       ISBN: 0-471-98141-9
+       Notes: English translation.
+       
+     * Title: "Linux 2.0"
+       Author: Remy Card, Eric Dumas, Franck Mevel.
+       Publisher: Gesti�n 2000.
+       Date: 1997.
+       Pages: 501.
+       ISBN: 8-480-88208-5
+       Notes: Spanish translation.
+       
+     * Title: "Unix internals -- the new frontiers"
+       Author: Uresh Vahalia.
+       Publisher: Prentice Hall.
+       Date: 1996.
+       Pages: 600.
+       ISBN: 0-13-101908-2
+       
+     * Title: "Linux Core Kernel Commentary. Guide to Insider's Knowledge
+       on the Core Kernel od the Linux Code"
+       Author: Scott Maxwell.
+       Publisher: ???.
+       Date: 1999.
+       Pages: 592.
+       ISBN: 1-57610-469-9
+       Notes: CD-ROM included.
+       
+     MISCELLANEOUS:
    
+     * Name: Linux Source Driver.
+       URL: http://lsd.linux.cz
+       Keywords: Browsing source code.
+       Description: "Linux Source Driver (LSD) is an application, which
+       can make browsing source codes of Linux kernel easier than you can
+       imagine. You can select between multiple versions of kernel (e.g.
+       0.01, 1.0.0, 2.0.33, 2.0.34pre13, 2.0.0, 2.1.101 etc.). With LSD
+       you can search Linux kernel (fulltext, macros, types, functions
+       and variables) and LSD can generate patches for you on the fly
+       (files, directories or kernel)".
+       
+     * Name: Cross-Referencing Linux.
+       URL: http://lxr.linux.no/source/
+       Keywords: Browsing source code.
+       Description: Another web-based Linux kernel source code browser.
+       Lots of cross references to variables and functions. You can see
+       where they are defined and where they are used.
+       
+     * Name: Linux Weekly News.
+       URL: http://lwn.net
+       Keywords: latest kernel news.
+       Description: The title says it all. There's a fixed kernel section
+       summarizing developers' work, bug fixes, new features and versions
+       produced during the week. Published every Thursday.
+       
+     * Name: Kernel Traffic.
+       URL: http://kt.linuxcare.com
+       Keywords: linux-kernel mailing list, weekly kernel news.
+       Description: Weekly newsletter covering the most relevant
+       discussions of the linux-kernel mailing list.
+       
+     * Name: CuTTiNG.eDGe.LiNuX.
+       URL: http://edge.kernelnotes.org
+       Keywords: changelist.
+       Description: Site which provides the changelist for every kernel
+       release. What's new, what's better, what's changed. Myrdraal reads
+       the patches and describes them. Pointers to the patches are there,
+       too.
+       
+     * Name: New linux-kernel Mailing List FAQ.
+       URL: Original site:
+       http://www.altern.org/andrebalsa/doc/lkml-faq.html
+       URL: U.S. mirror site:
+       http://www.ececs.uc.edu/~rreilova/linux/lkml-faq.html
+       Keywords: linux-kernel mailing list FAQ.
+       Description: linux-kernel is a mailing list for developers to
+       communicate. This FAQ builds on the previous linux-kernel mailing
+       list FAQ maintained by Frohwalt Egerer, who no longer maintains
+       it. Read it to see how to join the mailing list. Dozens of
+       interesting questions regarding the list, Linux, developers (who
+       is ...?), terms (what is...?) are answered here too. Just read it.
        
-     * MISCELLANEOUS:
-       
-          + Name: Linux Source Driver.
-            URL: http://lsd.linux.cz
-            Keywords: Browsing.
-            Description: "Linux Source Driver (LSD) is an application,
-            which can make browsing source codes of Linux kernel easier
-            than you can imagine. You can select between multiple
-            versions of kernel (e.g. 0.01, 1.0.0, 2.0.33, 2.0.34pre13,
-            2.0.0, 2.1.101 etc.). With LSD you can search Linux kernel
-            (fulltext, macros, types, functions and variables) and LSD
-            can generate patches for you on the fly (files, directories
-            or kernel)".
-       
-          + Name: Linux Weekly News.
-            URL: http://lwn.net
-            Keywords: last kernel news.
-            Description: The title says it all. There's a fixed kernel
-            section summarizing developers' work, bug fixes, new features
-            and versions produced during the week. Published every
-            Thursday.
-       
-          + Name: CuTTiNG.eDGe.LiNuX.
-            URL: http://edge.linuxhq.com
-            Keywords: changelist.
-            Description: Site which provides the changelist for every
-            kernel release. What's new, what's better, what's changed.
-            Myrdraal reads the patchs and describes them. Pointers to the
-            patches are there, too.
+     * Name: "Linux Virtual File System"
+       Author: Peter J. Braam.
+       URL: http://www.coda.cs.cmu.edu/doc/talks/linuxvfs
+       Keywords: slides, VFS, inode, superblock, dentry, dcache.
+       Description: Set of slides, presumably from a presentation on the
+       Linux VFS layer. Covers version 2.1.x, with dentries and the
+       dcache.
+     _________________________________________________________________
    
-          + Name: New linux-kernel Mailing List FAQ.
-            URL: Original site:
-            http://www.altern.org/andrebalsa/doc/lkml-faq.html
-            URL: U.S. mirror site:
-            http://www.ececs.uc.edu/~rreilova/linux/lkml-faq.html
-            Keywords: linux-kernel mailing list FAQ.
-            Description: linux-kernel is a mailing list for developers
-            to communicate. This FAQ builds on the previous linux-kernel
-            mailing list FAQ maintained by Frohwalt Egerer, who no longer
-            maintains it. Read it to see how to join the mailing list.
-            Dozens of interesting questions regarding the list, Linux,
-            developers (who is ...?), terms (what is...?) are answered
-            here too. Just read it.
-       
-          + Name: "Linux Virtual File System"
-            Author: Peter J. Braam.
-            URL: http://www.coda.cs.cmu.edu/doc/talks/linuxvfs
-            Keywords: slides, VFS, inode, superblock, dentry, dcache.
-            Description: Set of slides, presumably from a presentation
-            on the Linux VFS layer. Covers version 2.1.x, with dentries
-            and the dcache.
+   Document last updated on Tue Nov 30 11:20:00 CET 1999
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d82ffd885..2821f515d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -10,41 +10,41 @@ The text in square brackets at the beginning of the description state the
 restrictions on the kernel for the said kernel parameter to be valid. The
 restrictions referred to are that the relevant option is valid if:
 
-    APIC	APIC support is enabled.
-    APM 	Advanced Power Management support is enabled.
-    AX25	Appropriate AX.25 support is enabled.
-    CD		Appropriate CD support is enabled.
-    EIDE	EIDE/ATAPI support is enabled.
-    FB		The frame buffer device is enabled.
-    HW		Appropriate hardware is enabled.
-    ISDN	Appropriate ISDN support is enabled.
-    JOY 	Appropriate joystick support is enabled.
-    LP		Printer support is enabled.
-    LOOP	Loopback device support is enabled.
-    MCA 	MCA bus support is enabled.
-    MDA 	The MDA console is enabled.
-    MOUSE	Appropriate mouse support is enabled.
-    NET 	Appropriate network support is enabled.
-    NFS 	Appropriate NFS support is enabled.
-    PARIDE	The ParIDE subsystem is enabled.
-    PCI 	PCI bus support is enabled.
-    PCMCIA	The PCMCIA subsystem is enabled.
-    PNP 	Plug & Play support is enabled.
-    PPT		Parallel port support is enabled.
-    PS2 	Appropriate PS/2 support is enabled.
-    RAM 	RAMdisc support is enabled.
-    SCSI	Appropriate SCSI support is enabled.
-    SERIAL	Serial support is enabled.
-    SMP 	The kernel is an SMP kernel.
-    SOUND	Appropriate sound system support is enabled.
-    VGA 	The VGA console has been enabled.
-    VT		Virtual terminal support is enabled.
-    XT		IBM PC/XT MFM hard disk support is enabled.
+	APIC	APIC support is enabled.
+	APM 	Advanced Power Management support is enabled.
+	AX25	Appropriate AX.25 support is enabled.
+	CD	Appropriate CD support is enabled.
+	EIDE	EIDE/ATAPI support is enabled.
+	FB	The frame buffer device is enabled.
+	HW	Appropriate hardware is enabled.
+	ISDN	Appropriate ISDN support is enabled.
+	JOY 	Appropriate joystick support is enabled.
+	LP	Printer support is enabled.
+	LOOP	Loopback device support is enabled.
+	MCA 	MCA bus support is enabled.
+	MDA 	MDA console support is enabled.
+	MOUSE	Appropriate mouse support is enabled.
+	NET 	Appropriate network support is enabled.
+	NFS 	Appropriate NFS support is enabled.
+	PARIDE	The ParIDE subsystem is enabled.
+	PCI 	PCI bus support is enabled.
+	PCMCIA	The PCMCIA subsystem is enabled.
+	PNP 	Plug & Play support is enabled.
+	PPT	Parallel port support is enabled.
+	PS2 	Appropriate PS/2 support is enabled.
+	RAM 	RAM disk support is enabled.
+	SCSI	Appropriate SCSI support is enabled.
+	SERIAL	Serial support is enabled.
+	SMP 	The kernel is an SMP kernel.
+	SOUND	Appropriate sound system support is enabled.
+	VGA 	The VGA console has been enabled.
+	VT	Virtual terminal support is enabled.
+	XT	IBM PC/XT MFM hard disk support is enabled.
 
 In addition, the following text indicates that the option:
 
-    BUGS=	Relates to possible processor bugs on the said processor.
-    KNL 	Is a kernel start-up parameter.
+	BUGS=	Relates to possible processor bugs on the said processor.
+	KNL 	Is a kernel start-up parameter.
 
 Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
 a trailing = on the name of any parameter states that that parameter will
@@ -52,353 +52,353 @@ be entered as an environment variable, whereas its absence indicates that
 it will appear as a kernel argument readable via /proc/cmdline by programs
 running once the system is up.
 
-    53c7xx=		[HW,SCSI] Amiga SCSI controllers
+	53c7xx=		[HW,SCSI] Amiga SCSI controllers.
 
-    adb_buttons=	[HW,MOUSE]
+	adb_buttons=	[HW,MOUSE]
 
-    advansys=		[HW,SCSI]
+	advansys=	[HW,SCSI]
 
-    aha152x=		[HW,SCSI]
+	aha152x=	[HW,SCSI]
 
-    aha1542=		[HW,SCSI]
+	aha1542=	[HW,SCSI]
 
-    aic7xxx=		[HW,SCSI]
+	aic7xxx=	[HW,SCSI]
 
-    AM53C974=		[HW,SCSI]
+	AM53C974=	[HW,SCSI]
 
-    apm=		[APM] Advanced Power Management.
+	apm=		[APM] Advanced Power Management.
 
-    arcrimi=		[HW,NET]
+	arcrimi=	[HW,NET]
 
-	ataflop=		[HW, M68k]
+	ataflop=	[HW, M68k]
 
-    atamouse=		[HW,MOUSE] Atari Mouse.
+	atamouse=	[HW,MOUSE] Atari Mouse.
 
-    atascsi=		[HW,SCSI] Atari SCSI.
+	atascsi=	[HW,SCSI] Atari SCSI.
 
-    aztcd=		[HW,CD] Aztec CD driver.
+	aztcd=		[HW,CD] Aztec CD driver.
 
-    baycom_par= 	[HW,AX25] BayCom Parallel Port AX.25 Modem.
+	baycom_par= 	[HW,AX25] BayCom Parallel Port AX.25 Modem.
 
-    baycom_ser_fdx=	[HW,AX25] BayCom Serial Port AX.25 Modem in Full
+	baycom_ser_fdx=	[HW,AX25] BayCom Serial Port AX.25 Modem in Full
 			Duplex Mode.
 
-    baycom_ser_hdx=	[HW,AX25] BayCom Serial Port AX.25 Modem in Half
+	baycom_ser_hdx=	[HW,AX25] BayCom Serial Port AX.25 Modem in Half
 			Duplex Mode.
 
-    bmouse=		[HW,MOUSE,PS2] Bus mouse.
+	bmouse=		[HW,MOUSE,PS2] Bus mouse.
 
-    BusLogic=		[HW,SCSI]
+	BusLogic=	[HW,SCSI]
 
-    cdu31a=		[HW,CD]
+	cdu31a=		[HW,CD]
 
-    cm206=		[HW,CD]
+	cm206=		[HW,CD]
 
-    com20020=		[HW,NET]
+	com20020=	[HW,NET]
 
-    com90io=		[HW,NET]
+	com90io=	[HW,NET]
 
-    com90xx=		[HW,NET]
+	com90xx=	[HW,NET]
 
-    console=		[KNL] output console + comm spec (speed, control, parity)
+	console=	[KNL] output console + comm spec (speed, control,
+			parity).
 
-    cyclades=		[HW,SERIAL] Cyclades multi-serial port adapter.
+	cyclades=	[HW,SERIAL] Cyclades multi-serial port adapter.
 
-    debug		[KNL] Enable kernel debugging (events log level).
+	debug		[KNL] Enable kernel debugging (events log level).
 
-    decnet=		[HW,NET]
+	decnet=		[HW,NET]
 
-    digi=		[HW,SERIAL] io parameters + enable/disable command
+	digi=		[HW,SERIAL] io parameters + enable/disable command.
 
-    digiepca=		[HW,SERIAL]
+	digiepca=	[HW,SERIAL]
 
-    dmascc=		[HW,AX25,SERIAL] AX.25 Z80SCC driver with DMA
+	dmascc=		[HW,AX25,SERIAL] AX.25 Z80SCC driver with DMA
 			support available.
 
-    dmasound=		[HW,SOUND] (sound subsystem buffers)
+	dmasound=	[HW,SOUND] (sound subsystem buffers).
 
-    dtc3181e=		[HW,SCSI]
+	dtc3181e=	[HW,SCSI]
 
-    eata=		[HW,SCSI]
+	eata=		[HW,SCSI]
 
-    eda=		[HW,PS2]
+	eda=		[HW,PS2]
 
-    edb=		[HW,PS2]
+	edb=		[HW,PS2]
 
-    ether=		[HW,NET] Ethernet cards parameters (iomem,irq,dev_name).
+	ether=		[HW,NET] Ethernet cards parameters (iomem, irq,
+			dev_name).
 
-    fd_mcs=		[HW,SCSI]
+	fd_mcs=		[HW,SCSI]
 
-    fdomain=		[HW,SCSI]
+	fdomain=	[HW,SCSI]
 
-    floppy=		[HW]
+	floppy=		[HW]
 
-    ftape=		[HW] Floppy Tape subsystem debugging options.
+	ftape=		[HW] Floppy Tape subsystem debugging options.
 
-    gdth=		[HW,SCSI]
+	gdth=		[HW,SCSI]
 
-    gscd=		[HW,CD]
+	gscd=		[HW,CD]
 
-    gvp11=		[HW,SCSI]
+	gvp11=		[HW,SCSI]
 
-    hd= 		[EIDE] (E)IDE hard drive subsystem
-                geometry (Cyl/heads/sectors) or tune parameters.
+	hd= 		[EIDE] (E)IDE hard drive subsystem geometry
+			(Cyl/heads/sectors) or tune parameters.
 
-    hfmodem=		[HW,AX25]
+	hfmodem=	[HW,AX25]
 
-    HiSax=		[HW,ISDN]
+	HiSax=		[HW,ISDN]
 
-    hisax=		[HW,ISDN]
+	hisax=		[HW,ISDN]
 
-      in2000=       [HW,SCSI]
+	in2000=		[HW,SCSI]
 
-      init=     [KNL]
+	init=		[KNL]
 
+	ibmmcascsi=	[HW,MCA,SCSI] IBM MicroChannel SCSI adapter.
 
-
-    ibmmcascsi= 	[HW,MCA,SCSI] IBM MicroChannel SCSI adapter.
-
-    icn=		[HW,ISDN]
+	icn=		[HW,ISDN]
 
 	ide?=		[HW] (E)IDE subsystem : config (iomem/irq), tuning or
-				debugging (serialize,reset,no{dma,tune,probe}) or
-				chipset specific parameters
+			debugging (serialize,reset,no{dma,tune,probe}) or
+			chipset specific parameters.
 	
-	idebus=		[HW] (E)IDE subsystem : VLB/PCI bus speed
-
-    in2000=		[HW,SCSI]
+	idebus=		[HW] (E)IDE subsystem : VLB/PCI bus speed.
 
-    init=		[KNL] default init level
+	in2000=		[HW,SCSI]
 
-	initrd=		[KNL] initial ramdisk path
+	init=		[KNL] Default init level.
 
-    ip= 		[PNP]
+	ip=		[PNP]
 
-    isp16=		[HW,CD]
+	isp16=		[HW,CD]
 
-    js_14=		[HW,JOY]
+	js_14=		[HW,JOY]
 
-    js_am=		[HW,JOY]
+	js_am=		[HW,JOY]
 
-    js_an=		[HW,JOY]
+	js_an=		[HW,JOY]
 
-    js_as=		[HW.JOY]
+	js_as=		[HW.JOY]
 
-    js_console= 	[HW,JOY]
+	js_console=	[HW,JOY]
 
-    js_console2=	[HW,JOY]
+	js_console2=	[HW,JOY]
 
-    js_console3=	[HW,JOY]
+	js_console3=	[HW,JOY]
 
-    js_db9=		[HW,JOY]
+	js_db9=		[HW,JOY]
 
-    js_db9_2=		[HW,JOY]
+	js_db9_2=	[HW,JOY]
 
-    js_db9_3=		[HW,JOY]
+	js_db9_3=	[HW,JOY]
 
-    js_tg=		[HW,JOY]
+	js_tg=		[HW,JOY]
 
-    js_tg_2=		[HW,JOY]
+	js_tg_2=	[HW,JOY]
 
-    js_tg_3=		[HW,JOY]
+	js_tg_3=	[HW,JOY]
 
-    kbd-reset		[VT]
+	kbd-reset	[VT]
 
-    load_ramdisk=	[RAM] initrd loading boolean
+	load_ramdisk=	[RAM] List of ramdisks to load from floppy.
 
-    lp=0 		[LP] Specify parallel ports to use, e.g,
-or  lp=port[,port...]	lp=none,parport0 (lp0 not configured, lp1 uses
-or  lp=reset		first parallel port).  'lp=0' disables the printer
-or  lp=auto		driver.  'lp=reset' (which can be specified in
-			addition to the ports) causes attached
-			printers to be reset.  Using
-			lp=port1,port2,... specifies the parallel
-			ports to associate lp devices with, starting
-			with lp0.  A port specification may be 'none'
-			to skip that lp device, or a parport name such
-			as 'parport0'.  Specifying 'lp=auto' instead
-			of a port specification list means that device
-			IDs from each port should be examined, to see
-			if an IEEE 1284-compliant printer is attached;
-			if so, the driver will manage that printer.
+	lp=0		[LP]	Specify parallel ports to use, e.g,
+	lp=port[,port...]	lp=none,parport0 (lp0 not configured, lp1 uses
+	lp=reset		first parallel port). 'lp=0' disables the
+	lp=auto			printer driver. 'lp=reset' (which can be
+				specified in addition to the ports) causes
+				attached printers to be reset. Using
+				lp=port1,port2,... specifies the parallel ports
+				to associate lp devices with, starting with
+				lp0. A port specification may be 'none' to skip
+				that lp device, or a parport name such as
+				'parport0'. Specifying 'lp=auto' instead of a
+				port specification list means that device IDs
+				from each port should be examined, to see if
+				an IEEE 1284-compliant printer is attached; if
+				so, the driver will manage that printer.
 
-    ltpc=		[HW]
+	ltpc=		[HW]
 
-    mac5380=		[HW,SCSI]
+	mac5380=	[HW,SCSI]
 
-    max_loop=[0-255]	[LOOP] States the maximum number of loopback devices
-    			that can be mounted.
+	max_loop=[0-255] [LOOP] Set the maximum number of loopback devices
+				that can be mounted.
 
-    maxcpus=		[SMP] States the maximum number of processors that
+	maxcpus=	[SMP] States the maximum number of processors that
 			an SMP kernel should make use of.
 
-    max_scsi_luns=	[SCSI]
+	max_scsi_luns=	[SCSI]
 
-    mca-pentium 	[BUGS=ix86]
+	mca-pentium	[BUGS=ix86]
 
-    mcd=		[HW,CD]
+	mcd=		[HW,CD]
 
-    mcdx=		[HW,CD]
+	mcdx=		[HW,CD]
 
-    md= 		[HW] RAID subsystems devices and level
+	md=		[HW] RAID subsystems devices and level.
 
-    mdacon=		[MDA]
+	mdacon=		[MDA]
 
-    mem=		[KNL] force use XX Mb of memory when the kernel is not able
-                      to see the whole system memory or for test
+	mem=		[KNL] force use XX Mb of memory when the kernel is not
+			able to see the whole system memory or for test.
 
-    msmouse=		[HW,MOUSE] Microsoft Mouse.
+	msmouse=	[HW,MOUSE] Microsoft Mouse.
 
-    ncr5380=		[HW,SCSI]
+	ncr5380=	[HW,SCSI]
 
-    ncr53c400=		[HW,SCSI]
+	ncr53c400=	[HW,SCSI]
 
-    ncr53c400a= 	[HW,SCSI]
+	ncr53c400a=	[HW,SCSI]
 
-    ncr53c406a= 	[HW,SCSI]
+	ncr53c406a=	[HW,SCSI]
 
-    ncr53c8xx=		[HW,SCSI]
+	ncr53c8xx=	[HW,SCSI]
 
-    nfsaddrs=		[NFS]
+	nfsaddrs=	[NFS]
 
-    nfsroot=		[NFS] nfs root filesystem for disk-less boxes
+	nfsroot=	[NFS] nfs root filesystem for disk-less boxes.
 
-	nmi_watchdog=	[KNL, BUGS=ix86] debugging features for SMP kernels
+	nmi_watchdog=	[KNL, BUGS=ix86] debugging features for SMP kernels.
 
-    no387		[BUGS=ix86] Tells the kernel to use the 387 maths
+	no387		[BUGS=ix86] Tells the kernel to use the 387 maths
 			emulation library even if a 387 maths coprocessor
 			is present.
 
-    noapic		[SMP,APIC] Tells the kernel not to make use of any
+	noapic		[SMP,APIC] Tells the kernel not to make use of any
 			APIC that may be present on the system.
 
-    noasync		[HW, M68K] Disables async and sync negotiation for all devices.
+	noasync		[HW, M68K] Disables async and sync negotiation for
+			all devices.
 
-    nodisconnect	[HW,SCSI, M68K] Disables SCSI disconnects.
+	nodisconnect	[HW,SCSI, M68K] Disables SCSI disconnects.
 
-    no-halt		[BUGS=ix86]
+	no-halt		[BUGS=ix86]
 
-    noinitrd		[RAM] Tells the kernel not to load any configured
-			initial ramdisc.
+	noinitrd	[RAM] Tells the kernel not to load any configured
+			initial RAM disk.
 
-    no-scroll		[VGA]
+	no-scroll	[VGA]
 
-    nosmp		[SMP] Tells an SMP kernel to act as a UP kernel.
+	nosmp		[SMP] Tells an SMP kernel to act as a UP kernel.
 
-    nosync		[HW, M68K] Disables sync negotiation for all devices.
+	nosync		[HW, M68K] Disables sync negotiation for all devices.
 
-    optcd=		[HW,CD]
+	optcd=		[HW,CD]
 
-    panic=		[KNL] kernel behaviour on panic
+	panic=		[KNL] kernel behaviour on panic.
 
-    parport=0			[HW,PPT] Specify parallel ports.  0
-or  parport=auto		disables.  Use 'auto' to force the driver
-or  parport=0xBBB[,IRQ[,DMA]]	to use any IRQ/DMA settings detected
-				(the default is to ignore 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'
-				(for using detected settings on that
-				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.
+	parport=0	[HW,PPT]	Specify parallel ports. 0 disables.
+	parport=auto			Use 'auto' to force the driver to use
+	parport=0xBBB[,IRQ[,DMA]]	any IRQ/DMA settings detected (the
+					default is to ignore 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' (for
+					using detected settings on that
+					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.
 
-    pas16=		[HW,SCSI]
+	pas16=		[HW,SCSI]
 
-    pcbit=		[HW,ISDN]
+	pcbit=		[HW,ISDN]
 
-    pcd.		[PARIDE]
+	pcd.		[PARIDE]
 
-    pci=		[PCI]
+	pci=		[PCI]
 
-    pd. 		[PARIDE]
+	pd.		[PARIDE]
 
-    pf. 		[PARIDE]
+	pf.		[PARIDE]
 
-    pg. 		[PARIDE]
+	pg.		[PARIDE]
 
-    pirq=		[SMP,APIC] mp-table
+	pirq=		[SMP,APIC] mp-table.
 
-    plip=		[PPT,NET] Parallel port network link.
+	plip=		[PPT,NET] Parallel port network link.
 
-    profile=	[KNL] enable kernel profiling via /proc/profile (param:log level)
+	profile=	[KNL] enable kernel profiling via /proc/profile
+			(param:log level).
 
-    prompt_ramdisk=	[RAM] Whether to prompt for ramdisk before loading
-			its contents into memory.
+	prompt_ramdisk=	[RAM] List of RAM disks to prompt for floppy disk
+			before loading.
 
-    pt. 		[PARIDE]
+	pt.		[PARIDE]
 
-    ramdisk=		[RAM]
+	ramdisk=	[RAM] Sizes of RAM disks in kilobytes [deprecated].
 
-    ramdisk_size=	[RAM]
+	ramdisk_size=	[RAM] New name for the ramdisk parameter.
 
-    ramdisk_start=	[RAM]
+	ramdisk_start=	[RAM] Starting block of RAM disk image (so you can
+			place it after the kernel image on a boot floppy).
 
-    reboot=		[BUGS=ix86]
+	reboot=		[BUGS=ix86]
 
-    reserve=	[KNL,BUGS] force the kernel to ignore some iomem area
+	reserve=	[KNL,BUGS] force the kernel to ignore some iomem area.
 
-    riscom8=		[HW,SERIAL]
+	riscom8=	[HW,SERIAL]
 
-    ro			[KNL] Mount root device read-only on boot.
+	ro		[KNL] Mount root device read-only on boot.
 
-    root=		[KNL] root filesystem
+	root=		[KNL] root filesystem.
 
-    rw			[KNL] Mount root device read-write on boot.
+	rw		[KNL] Mount root device read-write on boot.
 
-    S			[KNL] run init in single mode
+	S		[KNL] run init in single mode.
 
-    sbpcd=		[HW,CD] Soundblaster CD adapter.
+	sbpcd=		[HW,CD] Soundblaster CD adapter.
 
-    scsi_logging=	[SCSI]
+	scsi_logging=	[SCSI]
 
-    sjcd=		[HW,CD]
+	sjcd=		[HW,CD]
 
-    sonycd535=		[HW,CD]
+	sonycd535=	[HW,CD]
 
-    sound=		[SOUND]
+	sound=		[SOUND]
 
-    soundmodem= 	[HW,AX25,SOUND] Sound cards used as AX.25 modems.
+	soundmodem=	[HW,AX25,SOUND] Use sound card as packet radio modem.
 
-    specialix=		[HW,SERIAL] Specialix multi-serial port adapter.
+	specialix=	[HW,SERIAL] Specialix multi-serial port adapter.
 
-    st= 		[HW] SCSI tape parameters (buffers, ..)
+	st=		[HW] SCSI tape parameters (buffers, etc.).
 
-    st0x=		[HW,SCSI]
+	st0x=		[HW,SCSI]
 
-    stram_swap= 	[HW]
+	stram_swap=	[HW]
 
-    switches=		[HW, M68K]
+	switches=	[HW, M68K]
 
-    sym53c416=		[HW,SCSI]
+	sym53c416=	[HW,SCSI]
 
-    sym53c8xx=		[HW,SCSI]
+	sym53c8xx=	[HW,SCSI]
 
-    t128=		[HW,SCSI]
+	t128=		[HW,SCSI]
 
-    tmc8xx=		[HW,SCSI]
+	tmc8xx=		[HW,SCSI]
 
-    tmscsim=		[HW,SCSI]
+	tmscsim=	[HW,SCSI]
 
-    tp720=		[HW,PS2]
+	tp720=		[HW,PS2]
 
-    u14-34f=		[HW,SCSI]
+	u14-34f=	[HW,SCSI]
 
-    video=		[FB]  frame buffer configuration
+	video=		[FB] frame buffer configuration.
 
-    vga=		[KNL]  on ix386, enable to choose a peculiar video mode
-                       vga=ask
+	vga=		[KNL] on ix386, enable to choose a peculiar video mode
+			(use vga=ask for menu).
 
-    wd33c93=		[HW,SCSI]
+	wd33c93=	[HW,SCSI]
 
-    wd7000=		[HW,SCSI]
+	wd7000=		[HW,SCSI]
 
-    wdt=		[HW]
+	wdt=		[HW]
 
-    xd= 		[HW,XT] Original XT pre-IDE (RLL encoded) disks
+	xd=		[HW,XT] Original XT pre-IDE (RLL encoded) disks.
 
-    xd_geo=		[HW,XT]
+	xd_geo=		[HW,XT]
diff --git a/Documentation/moxa-smartio b/Documentation/moxa-smartio
new file mode 100644
index 000000000..4357e6772
--- /dev/null
+++ b/Documentation/moxa-smartio
@@ -0,0 +1,412 @@
+=============================================================================
+
+	MOXA Smartio Family Device Driver Ver 1.1 Installation Guide
+		    for Linux Kernel 2.2.x and 2.0.3x
+	       Copyright (C) 1999, Moxa Technologies Co, Ltd.
+=============================================================================
+Content
+
+1. Introduction
+2. System Requirement
+3. Installation
+4. Utilities
+5. Setserial
+6. Troubleshooting
+
+-----------------------------------------------------------------------------
+1. Introduction
+
+   The Smartio family Linux driver, Ver. 1.1, supports following multiport
+   boards.
+
+    -C104P/H/HS, C104H/PCI, C104HS/PCI, CI-104J 4 port multiport board.
+    -C168P/H/HS, C168H/PCI 8 port multiport board.
+
+   This driver has been modified a little and cleaned up from the Moxa
+   contributed driver code and merged into Linux 2.2.14pre. In paticular
+   official major/minor numbers have been assigned which are different to
+   those the original Moxa supplied driver used.
+
+   This driver and installation procedure have been developed upon Linux Kernel
+   2.2.5 and backward compatible to 2.0.3x. This driver supports Intel x86 and
+   Alpha hardware platform. In order to maintain compatibility, this version
+   has also been properly tested with RedHat, OpenLinux, TurboLinux and
+   S.u.S.E Linux. However, if compatibility problem occurs, please contact
+   Moxa at support@moxa.com.tw.
+
+   In addition to device driver, useful utilities are also provided in this
+   version. They are
+    - msdiag     Diagnostic program for detecting installed Moxa Smartio boards.
+    - msmon      Monitor program to observe data count and line status signals.
+    - msterm     A simple terminal program which is useful in testing serial
+	         ports.
+    - io-irq.exe Configuration program to setup ISA boards. Please note that
+                 this program can only be executed under DOS.
+
+   All the drivers and utilities are published in form of source code under
+   GNU General Public License in this version. Please refer to GNU General
+   Public License announcement in each source code file for more detail.
+
+   In Moxa's ftp sites, you may always find latest driver at
+   ftp://ftp.moxa.com  or ftp://ftp.moxa.com.tw.
+
+   This version of driver can be installed as Loadable Module (Module driver)
+   or built-in into kernel (Static driver). You may refer to following
+   installation procedure for suitable one. Before you install the driver,
+   please refer to hardware installation procedure in the User's Manual.
+
+   We assume the user should be familiar with following documents.
+   - Serial-HOWTO
+   - Kernel-HOWTO
+
+-----------------------------------------------------------------------------
+2. System Requirement
+   - Hardware platform: Intel x86 or Alpha machine
+   - Kernel version: 2.0.3x or 2.2.x
+   - gcc version 2.72 or later
+   - Maximum 4 boards can be installed in combination
+
+-----------------------------------------------------------------------------
+3. Installation
+
+   3.1 Hardware installation
+
+       There are two types of buses, ISA and PCI, for Smartio family multiport
+       board.
+
+       ISA board
+       ---------
+       You'll have to configure CAP address, I/O address, Interrupt Vector
+       as well as IRQ before installing this driver. Please refer to hardware
+       installation procedure in User's Manual before proceed any further.
+       Please make sure the JP1 is open after the ISA board is set properly.
+
+       PCI board
+       ---------
+       You may need to adjust IRQ useage in BIOS to avoid from IRQ conflict
+       with other ISA devices. Please refer to hardware installation
+       procedure in User's Manual in advance.
+
+       IRQ Sharing
+       -----------
+       Each port within the same multiport board shares the same IRQ. Up to
+       4 Moxa Smartio Family multiport boards can be installed together on
+       one system and they can share the same IRQ.
+
+   3.2 Driver files and device naming convention
+
+       The driver file may be obtained from ftp, CD-ROM or floppy disk. The
+       first step, anyway, is to copy driver file "mxser.tgz" into specified
+       directory. e.g. /moxa. The execute commands as below.
+
+       # cd /moxa
+       # tar xvf /dev/fd0 
+       or
+       # cd /moxa
+       # cp /mnt/cdrom/<driver directory>/mxser.tgz .
+       # tar xvfz mxser.tgz
+
+       You may find all the driver and utilities files in /moxa/mxser.
+       Following installation procedure depends on the model you'd like to
+       run the driver. If you prefer module driver, please refer to 3.3.
+       If static driver is required, please refer to 3.4.
+
+       Dialin and callout port
+       -----------------------
+       This driver remains traditional serial device properties. There're
+       two special file name for each serial port. One is dial-in port
+       which is named "ttyMxx". For callout port, the naming convention
+       is "cumxx".
+
+       Device naming when more than 2 boards installed
+       -----------------------------------------------
+       Naming convention for each Smartio multiport board is pre-defined
+       as below.
+
+       Board Num.	 Dial-in Port	      Callout port
+       1st board	ttyM0  - ttyM7	      cum0  - cum7
+       2nd board	ttyM8  - ttyM15       cum8  - cum15
+       3rd board	ttyM16 - ttyM23       cum16 - cum23
+       4th board	ttyM24 - ttym31       cum24 - cum31
+
+       Board sequence
+       --------------
+       This driver will activate ISA boards according to the parameter set
+       in the driver. After all specified ISA board activated, PCI board
+       will be installed in the system automatically driven.
+       Therefore the board number is sorted by the CAP address of ISA boards.
+       For PCI boards, their sequence will be after ISA boards and C168H/PCI
+       has higher priority than C104H/PCI boards.
+
+   3.3 Module driver configuration
+       Module driver is easiest way to install. If you prefer static driver
+       installation, please skip this paragraph.
+       1. Find "Makefile" in /moxa/mxser, then run
+
+	  # make install
+
+	  The driver files "mxser.o" and utilities will be properly compiled
+	  and copied to system directories respectively.Then run
+
+	  # insmod mxser
+
+	  to activate the moduler driver. You may run "lsmod" to check
+	  if "mxser.o" is activated.
+
+       2. Create special files by executing "msmknod".
+	  # cd /moxa/mxser/driver
+	  # ./msmknod
+
+	  Default major numbers for dial-in device and callout device are
+	  174, 175. Msmknod will delete any special files occuping the same
+	  device naming.
+
+       3. Up to now, you may manually execute "insmod mxser" to activate
+	  this driver and run "rmmod mxser" to remove it. However, it's
+	  better to have a boot time configuration to eliminate manual
+	  operation.
+	  Boot time configuration can be achieved by rc file. Run following
+	  command for setting rc files.
+
+	  # cd /moxa/mxser/driver
+	  # cp ./rc.mxser /etc/rc.d
+	  # cd /etc/rc.d
+
+	  You may have to modify part of the content in rc.mxser to specify
+          parameters for ISA board. Please refer to rc.mxser for more detail.
+          Find "rc.serial". If "rc.serial" doesn't exist, create it by vi.
+	  Add "rc.mxser" in last line. Next, open rc.local by vi
+	  and append following content.
+
+	  if [ -f /etc/rc.d/rc.serial ]; then
+	     sh /etc/rc.d/rc.serial
+	  fi
+
+       4. Reboot and check if mxser.o activated by "lsmod" command.
+       5. If you'd like to drive Smartio ISA boards in the system, you'll
+	  have to add parameter to specify CAP address of given board while
+          activating "mxser.o". The format for parameters are as follows.
+
+	  insmod mxser ioaddr=0x???,0x???,0x???,0x???
+				|      |     |	  |
+				|      |     |	  +- 4th ISA board
+				|      |     +------ 3rd ISA board
+				|      +------------ 2nd ISA board
+				+------------------- 1st ISA board
+
+   3.4 Static driver configuration
+
+       1. Create link
+	  # cd /usr/src/linux/drivers/char
+	  # ln -s /moxa/mxser/driver/mxser.c mxser.c
+
+       2. Add CAP address list for ISA boards
+	  In module mode, the CAP address for ISA board is given by
+	  parameter. In static driver configuration, you'll have to
+	  assign it within driver's source code. If you will not
+	  install any ISA boards, you may skip to next portion.
+	  The instructions to modify driver source code are as
+	  below.
+	  a. # cd /moxa/mxser/driver
+	     # vi mxser.c
+	  b. Find the array mxserBoardCAP[] as belows.
+
+	     static int mxserBoardCAP[]
+	     = {0x00, 0x00, 0x00, 0x00};
+
+	  c. Change the address within this array using vi. For
+	     example, to driver 2 ISA boards with CAP address
+	     0x280 and 0x180 as 1st and 2nd board. Just to change
+	     the source code as follows.
+
+	     static int mxserBoardCAP[]
+	     = {0x280, 0x180, 0x00, 0x00};
+
+       3. Modify tty_io.c
+	  # cd /usr/src/linux/drivers/char/
+	  # vi tty_io.c
+	    Find pty_init(), insert "mxser_init()" as
+
+	    pty_init();
+	    mxser_init();
+
+       4. Modify tty.h
+	  # cd /usr/src/linux/include/linux
+	  # vi tty.h
+	    Find extern int tty_init(void), insert "mxser_init()" as
+
+	    extern int tty_init(void);
+	    extern int mxser_init(void);
+     
+       5. Modify Makefile
+	  # cd /usr/src/linux/drivers/char
+	  # vi Makefile
+	    Find L_OBJS := tty_io.o ...... random.o, add
+	    "mxser.o" at last of this line as
+	    L_OBJS := tty_io.o ....... mxser.o
+
+       6. Rebuild kernel
+	  The following are for Linux kernel rebuilding,for your reference only.
+	  For appropriate details, please refer to the Linux document.
+
+	  If 'lilo' utility is installed, please use 'make zlilo' to rebuild
+	  kernel. If 'lilo' is not installed, please follow the following steps.
+
+	   a. cd /usr/src/linux
+	   b. make clean			     /* take a few minutes */
+	   c. make dep				     /* take a few minutes */
+	   d. make bzImage		   /* take probably 10-20 minutes */
+	   e. Backup original boot kernel.		  /* optional step */
+	   f. cp /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz
+	   g. Please make sure the boot kernel (vmlinuz) is in the
+	      correct position. If you use 'lilo' utility, you should
+	      check /etc/lilo.conf 'image' item specifiedd the path
+	      which is the 'vmlinuz' path, or you will load wrong
+	      (or old) boot kernel image (vmlinuz).
+	   h. chmod 400 /vmlinuz
+	   i. lilo
+	   j. rdev -R /vmlinuz 1
+	   k. sync
+
+	  Note that if the result of "make zImage" is ERROR, then you have to
+	  go back to Linux configuration Setup. Type "make config" in directory
+	  /usr/src/linux or "setup".
+
+	  Since system include file, /usr/src/linux/include/linux/interrupt.h,
+	  is modified each time the MOXA driver is installed, kernel rebuilding
+	  is inevitable. And it takes about 10 to 20 minutes depends on the
+	  machine.
+
+       7. Make utility
+	  # cd /moxa/mxser/utility
+	  # make install
+       
+       8. Make special file
+          # cd /moxa/mxser/driver
+          # ./msmknod
+
+       9. Reboot
+
+   3.5 Custom configuration
+       Although this driver already provides you default configuration, you
+       still can change the device name and major number.The instruction to
+       change these parameters are shown as below.
+
+       Change Device name
+       ------------------
+       If you'd like to use other device names instead of default naming
+       convention, all you have to do is to modify the internal code
+       within the shell script "msmknod". First, you have to open "msmknod"
+       by vi. Locate each line contains "ttyM" and "cum" and change them
+       to the device name you desired. "msmknod" creates the device names
+       you need next time executed.
+
+       Change Major number
+       -------------------
+       If major number 30 and 35 had been occupied, you may have to select
+       2 free major numbers for this driver. There are 3 steps to change
+       major numbers.
+
+       1. Find free major numbers
+	  In /proc/devices, you may find all the major numbers occupied
+	  in the system. Please select 2 major numbers that are available.
+	  e.g. 40, 45.
+       2. Create special files
+	  Run /moxa/mxser/driver/msmknod to create special files with
+	  specified major numbers.
+       3. Modify driver with new major number
+	  Run vi to open /moxa/mxser/driver/mxser.c. Locate the line
+	  contains "MXSERMAJOR". Change the content as below.
+	  #define	  MXSERMAJOR		  40
+	  #define	  MXSERCUMAJOR		  45
+       4. Run # make install in /moxa/mxser/driver.
+
+   3.6 Verify driver installation
+       You may refer to /var/log/messages to check the latest status
+       log reported by this driver whenever it's activated.
+-----------------------------------------------------------------------------
+4. Utilities
+   There are 3 utilities contained in this driver. They are msdiag, msmon and
+   msterm. These 3 utilities are released in form of source code. They should
+   be compiled into executable file and copied into /usr/bin.
+
+   msdiag - Diagnostic
+   --------------------
+   This utility provides the function to detect what Moxa Smartio multiport
+   board exists in the system.
+
+   msmon - Port Monitoring
+   -----------------------
+   This utility gives the user a quick view about all the MOXA ports'
+   activities. One can easily learn each port's total received/transmitted
+   (Rx/Tx) character count since the time when the monitoring is started.
+   Rx/Tx throughputs per second are also reported in interval basis (e.g.
+   the last 5 seconds) and in average basis (since the time the monitoring
+   is started). You can reset all ports' count by <HOME> key. <+> <->
+   (plus/minus) keys to change the displaying time interval. Press <ENTER>
+   on the port, that cursor stay, to view the port's communication
+   parameters, signal status, and input/output queue.
+
+   msterm - Terminal Emulation
+   ---------------------------
+   This utility provides data sending and receiving ability of all tty ports,
+   especially for MOXA ports. It is quite useful for testing simple
+   application, for example, sending AT command to a modem connected to the
+   port or used as a terminal for login purpose. Note that this is only a
+   dumb terminal emulation without handling full screen operation.
+-----------------------------------------------------------------------------
+5. Setserial
+
+   Supported Setserial parameters are listed as below.
+
+   uart 	  set UART type(16450-->disable FIFO, 16550A-->enable FIFO)
+   close_delay	  set the amount of time(in 1/100 of a second) that DTR
+		  should be kept low while being closed.
+   closing_wait   set the amount of time(in 1/100 of a second) that the
+		  serial port should wait for data to be drained while
+		  being closed, before the receiver is disable.
+   spd_hi	  Use  57.6kb  when  the application requests 38.4kb.
+   spd_vhi	  Use  115.2kb	when  the application requests 38.4kb.
+   spd_normal	  Use  38.4kb  when  the application requests 38.4kb.
+
+-----------------------------------------------------------------------------
+6. Troubleshooting
+
+   The boot time error mesages and solutions are stated as clearly as
+   possible. If all the possible solutions fail, please contact our technical
+   support team to get more help.
+
+   Error msg: More than 4 Moxa Smartio family boards found. Fifth board and
+	      after are ignored.
+   Solution:
+   To avoid this problem, please unplug fifth and after board, because Moxa
+   driver supports up to 4 boards.
+
+   Error msg: Request_irq fail, IRQ(?) may be conflict with another device.
+   Solution:
+   Other PCI or ISA devices occupy the assigned IRQ. If you are not sure
+   which device causes the situation,please check /proc/interrupts to find
+   free IRQ and simply change another free IRQ for Moxa board.
+
+   Error msg: Board #: C1xx Series(CAP=xxx) interupt number invalid.
+   Solution:
+   Each port within the same multiport board shares the same IRQ. Please set
+   one IRQ (IRQ doesn't equal to zero) for one Moxa board.
+
+   Error msg: No interrupt vector be set for Moxa ISA board(CAP=xxx).
+   Solution:
+   Moxa ISA board needs an interrupt vector.Please refer to user's manual
+   "Hardware Installation" chapter to set interrupt vector.
+
+   Error msg: Couldn't install MOXA Smartio family driver!
+   Solution:
+   Load Moxa driver fail, the major number may conflict with other devices.
+   Please refer to previous section 3.5 to change a free major number for
+   Moxa driver.
+
+   Error msg: Couldn't install MOXA Smartio family callout driver!
+   Solution:
+   Load Moxa callout driver fail, the callout device major number may
+   conflict with other devices. Please refer to previous section 3.5 to
+   change a free callout device major number for Moxa driver.
+-----------------------------------------------------------------------------
diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index d7a8baf3f..09ae1d978 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -12,6 +12,8 @@
                 - Swansea University Computer Society DECnet Archive
                   (contains kernel patches and info)
                 - Mirror of userland tools on ftp.dreamtime.org
+                - Mirror of Alexey Kuznetsov's iproute2 package and
+                  other utilities
 
         ftp://ftp.dreamtime.org/pub/linux/decnet/
                 - Patrick Caulfield's archive of userland tools and
@@ -39,10 +41,16 @@ The kernel command line takes options looking like the following:
 
     decnet=1,2,1
 
-the first two numbers are the node address 1,2 = 1.2 (yes, you must use
-commas when specifying them). The third number is the level number for routers
-and is optional. It is probably a good idea to set the DECnet address on boot
-like this rather than trying to do it later.
+the first two numbers are the node address 1,2 = 1.2 For 2.2.xx kernels
+and early 2.3.xx kernels, you must use a comma when specifying the
+DECnet address like this. For more recent 2.3.xx kernels, you may
+use almost charecter except space, although a `.` would be the most
+obvious choice :-)
+
+The third number is the level number for routers and is optional. In fact
+this option may go away shortly in favour if settings for each interface
+seperately. It is probably a good idea to set the DECnet address and type
+on boot like this rather than trying to do it later.
 
 There are also equivalent options for modules. The node address and type can
 also be set through the /proc/sys/net/decnet/ files, as can other system
@@ -71,7 +79,23 @@ is available. Usually this will be eth0, for example:
 There is a list of what the other files under /proc/sys/net/decnet/ do
 on the kernel patch web site (shown above).
 
-4) How can I tell if its working ?
+4) Run time kernel configuration
+
+This is either done through the sysctl/proc interface (see the kernel web
+pages for details on what the various options do) or through the iproute2
+package in the same way as IPv4/6 configuration is performed.
+
+Documentation for iproute2 is included with the package, although there is
+as yet no specific section on DECnet, most of the features apply to both
+IP and DECnet, albeit with DECnet addresses instead of IP addresses and
+a reduced functionality.
+
+If you want to configure a DECnet router you'll need the iproute2 package
+since its the _only_ way to add and delete routes currently. Eventually
+there will be a routing daemon to send and receive routing messages for
+each interface and update the kernel routing tables accordingly.
+
+5) How can I tell if its working ?
 
 Here is a quick guide of what to look for in order to know if your DECnet
 kernel subsystem is working.
@@ -102,11 +126,11 @@ kernel subsystem is working.
      network, and see if you can obtain the same results.
    - At this point you are on your own... :-)
 
-5) How to send a bug report
+6) How to send a bug report
 
 If you've found a bug and want to report it, then there are several things
 you can do to help me work out exactly what it is that is wrong. Useful
-information (a lot of which is essential) includes:
+information (_most_ of which _is_ _essential_) includes:
 
  - What kernel version are you running ?
  - What version of the patch are you running ?
@@ -121,10 +145,10 @@ information (a lot of which is essential) includes:
  - How can the problem be reproduced ?
  - Can you use tcpdump to get a trace ? (N.B. Most (all?) versions of 
    tcpdump don't understand how to dump DECnet properly, so including
-   the hex listing of the packet contents is essential, usually the -x flag.
+   the hex listing of the packet contents is _essential_, usually the -x flag.
    You may also need to increase the length grabbed with the -s flag)
 
-6) Mailing list
+7) Mailing list
 
 If you are keen to get involved in development, or want to ask questions
 about configuration, or even just report bugs, then there is a mailing
@@ -134,7 +158,7 @@ subscribe linux-decnet
 
 as the body of the message.
 
-7) Legal Info
+8) Legal Info
 
 The Linux DECnet project team have placed their code under the GPL. The
 software is provided "as is" and without warranty express or implied.
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 614cf43b7..e432afc64 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -13,30 +13,10 @@ ip_forward - BOOLEAN
 ip_default_ttl - INTEGER
 	default 64
 
-ip_addrmask_agent - BOOLEAN
-	Reply to ICMP ADDRESS MASK requests.
-	default TRUE (router)
-		FALSE (host)
-
-ip_bootp_agent - BOOLEAN
-	Accept packets with source address of sort 0.b.c.d
-	and destined to this host, broadcast or multicast.
-	Such packets are silently ignored otherwise.
-
-	default FALSE
-
 ip_no_pmtu_disc - BOOLEAN
 	Disable Path MTU Discovery.
 	default FALSE
 
-ip_fib_model - INTEGER
-	0 - (DEFAULT) Standard model. All routes are in class MAIN.
-	1 - default routes go to class DEFAULT. This mode should
-	    be very convenient for small ISPs making policy routing.
-	2 - RFC1812 compliant model.
-	    Interface routes are in class MAIN.
-	    Gateway routes are in class DEFAULT.
-
 IP Fragmentation:
 
 ipfrag_high_thresh - INTEGER
@@ -187,18 +167,17 @@ proxy_arp - BOOLEAN
 	Do proxy arp.
 
 shared_media - BOOLEAN
-	undocumented.
+	Send(router) or accept(host) RFC1620 shared media redirects.
+	Overrides ip_secure_redirects.
+	default TRUE
 
 secure_redirects - BOOLEAN
 	Accept ICMP redirect messages only for gateways,
 	listed in default gateway list.
 	default TRUE
 
-redirects - BOOLEAN
-	Send(router) or accept(host) RFC1620 shared media redirects.
-	Overrides ip_secure_redirects.
-	default TRUE (should be FALSE for distributed version,
-		      but I use it...)
+send_redirects - BOOLEAN
+	Send redirects, if router. Default: TRUE
 
 bootp_relay - BOOLEAN
 	Accept packets with source address 0.b.c.d destined
@@ -213,27 +192,17 @@ accept_source_route - BOOLEAN
 	default TRUE (router)
 		FALSE (host)
 
-rp_filter - INTEGER
-	2 - do source validation by reversed path, as specified in RFC1812
+rp_filter - BOOLEAN
+	1 - do source validation by reversed path, as specified in RFC1812
 	    Recommended option for single homed hosts and stub network
 	    routers. Could cause troubles for complicated (not loop free)
 	    networks running a slow unreliable protocol (sort of RIP),
 	    or using static routes.
 
-	1 - (DEFAULT) Weaker form of RP filtering: drop all the packets
-	    that look as sourced at a directly connected interface, but
-	    were input from another interface.
-	    
 	0 - No source validation. 
 
-	NOTE: do not disable this option! All BSD derived routing software
-	(sort of gated, routed etc. etc.) is confused by such packets,
-	even if they are valid. When enabled it also prevents ip spoofing
-	in some limited fashion.
-
-	NOTE: this option is turned on per default only when ip_forwarding
-	is on. For non-forwarding hosts it doesn't make much sense and 
-	makes some legal multihoming configurations impossible.
+	Default value is 0. Note that some distribution enable it
+	in startip scripts.
 
 Alexey Kuznetsov.
 kuznet@ms2.inr.ac.ru
@@ -241,4 +210,4 @@ kuznet@ms2.inr.ac.ru
 Updated by:
 Andi Kleen
 ak@muc.de
-$Id: ip-sysctl.txt,v 1.10 2000/01/06 00:41:42 davem Exp $
+$Id: ip-sysctl.txt,v 1.11 2000/01/08 20:32:41 davem Exp $
diff --git a/Documentation/paride.txt b/Documentation/paride.txt
index cef4600ca..e4312676b 100644
--- a/Documentation/paride.txt
+++ b/Documentation/paride.txt
@@ -356,7 +356,7 @@ the parallel port.  As the reset operation is potentially disruptive in
 multiple device environments, the PARIDE drivers will not do it 
 automatically.  You can however, force a printer reset by doing:
 
-	insmod lp
+	insmod lp reset=1
 	rmmod lp
 
 If you have one of these marginal cases, you should probably build
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 4a0a25e49..b4d7ff895 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -28,8 +28,12 @@ architecture-dependent code with (for example):
 
 to tell the parport code that you want three PC-style ports, one at
 0x3bc with no IRQ, one at 0x378 using IRQ 7, and one at 0x278 with an
-auto-detected IRQ.  Currently, PC-style (parport_pc), Sun Ultra/AX
-(parport_ax), Amiga, Atari, and MFC3 hardware is supported.
+auto-detected IRQ.  Currently, PC-style (parport_pc), Sun `bpp',
+Amiga, Atari, and MFC3 hardware is supported.
+
+PCI parallel I/O card support comes from parport_pc.  Base I/O
+addresses should not be specified for supported PCI cards since they
+are automatically detected.
 
 
 KMod
diff --git a/Documentation/sound/Introduction b/Documentation/sound/Introduction
index 0e9bbc865..2ab4867d9 100644
--- a/Documentation/sound/Introduction
+++ b/Documentation/sound/Introduction
@@ -25,7 +25,8 @@ History:
                    added info on multiple sound cards of similar types,]
                    added more diagnostics info, added info about esd.
                    added info on OSS and ALSA.
-
+1.1.1  19991031	   Added notes on sound-slot- and sound-service.
+			(Alan Cox)
 
 Modular Sound Drivers:
 ======================
@@ -321,6 +322,12 @@ in the Sound-HOWTO).
 
 7)  Turn on debug in drivers/sound/sound_config.h (DEB, DDB, MDB).
 
+8)  If the system reports insuffcient DMA memory then you may want to
+    load sound with the "dmabufs=1" option. Or in /etc/conf.modules add
+	
+	preinstall sound dmabufs=1
+
+    This makes the sound system allocate its buffers and hang onto them.
 
 Configuring Sound:
 ==================
@@ -335,7 +342,7 @@ There are several ways of configuring your sound:
 
 3)  In /etc/modules.conf when using modprobe.
 
-4)  Via Red Hat's /usr/sbin/sndconfig program (text based).
+4)  Via Red Hat's GPL'd /usr/sbin/sndconfig program (text based).
 
 5)  Via the OSS soundconf program (with the commercial version
     of the OSS driver.
@@ -344,6 +351,28 @@ And I am sure, several other ways.
 
 Anyone want to write a linuxconf module for configuring sound?
 
+Module Loading:
+===============
+
+When a sound card is first referenced and sound is modular the sound system
+will ask for the sound devices to be loaded. Initially it requests that
+the driver for the sound system is loaded. It then wwill ask for 
+sound-slot-0, where 0 is the first sound card. (sound-slot-1 the second and
+so on). Thus you can do
+
+alias sound-slot-0 sb
+
+To load a soundblaster at this point. If the slot loading does not provide
+the desired device - for example a soundblaster does not directly provide
+a midi synth in all cases then it will request "sound-service-0-n" where n
+is
+
+0	Mixer
+
+2  	MIDI
+
+3, 4	DSP audio
+
 
 For More Information (RTFM):
 ============================
@@ -373,6 +402,3 @@ For More Information (RTFM):
 Contact Information:
 ====================
 Wade Hampton:  (whampton@staffnet.com)
-
-
-
diff --git a/Documentation/sound/MultiSound b/Documentation/sound/MultiSound
index e8ae21aaf..e4a18bb7f 100644
--- a/Documentation/sound/MultiSound
+++ b/Documentation/sound/MultiSound
@@ -4,7 +4,7 @@
 #  -- Andrew Veliath <andrewtv@usa.net>
 #
 #  Last update:                      September 10, 1998
-#  Corresponding msnd driver:        0.8.2
+#  Corresponding msnd driver:        0.8.3
 #
 # ** This file is a README (top part) and shell archive (bottom part).
 #    The corresponding archived utility sources can be unpacked by
diff --git a/Documentation/sound/PSS b/Documentation/sound/PSS
new file mode 100644
index 000000000..ee81f7350
--- /dev/null
+++ b/Documentation/sound/PSS
@@ -0,0 +1,41 @@
+The PSS cards and other ECHO based cards provide an onboard DSP with 
+downloadable programs and also has an AD1848 "Microsoft Sound System" 
+device. The PSS driver enables MSS and MPU401 modes of the card. SB 
+is not enabled since it doesn't work concurrently with MSS. 
+
+If you build this driver as a module then the driver takes the folowing
+parameters
+
+pss_io. 	The I/O base the PSS card is configured at (normally 0x220
+		or 0x240)
+
+mss_io		The base address of the Microsoft Sound System interface.
+		This is normally 0x530, but may be 0x604 or other addresses.
+
+mss_irq		The interrupt assigned to the Microsoft Sound System
+		emulation. IRQ's 3,5,7,9,10,11 and 12 are available. If you
+		get IRQ errors be sure to check the interrupt is set to 
+		"ISA/Legacy" in the BIOS on modern machines.
+
+mss_dma		The DMA channel used by the Microsoft Sound System.
+		This can be 0, 1, or 3. DMA 0 is not available on older 
+		machines and will cause a crash on them.
+
+mpu_io		The MPU emulation base address. This sets the base of the
+		synthesizer. It is typically 0x330 but can be altered.
+
+mpu_irq		The interrupt to use for the synthesizer. It must differ
+		from the IRQ used by the Microsoft Sound System port.
+
+
+The mpu_io/mpu_irq fields are optional. If they are not specified the 
+synthesizer parts are not configured.
+
+When the module is loaded it looks for a file called 
+/etc/sound/pss_synth. This is the firmware file from the DOS install disks.
+This fil holds a general MIDI emulation. The file expected is called
+genmidi.ld on newer DOS driver install disks and synth.ld on older ones.
+
+You can also load alternative DSP algorithms into the card if you wish. One
+alternative driver can be found at http://www.mpg123.de/
+
diff --git a/Documentation/sound/SoundPro b/Documentation/sound/SoundPro
new file mode 100644
index 000000000..6e8c69ed2
--- /dev/null
+++ b/Documentation/sound/SoundPro
@@ -0,0 +1,103 @@
+Documentation for the SoundPro CMI8330 extensions in the WSS driver (ad1848.o)
+------------------------------------------------------------------------------
+
+Ion Badulescu, ionut@cs.columbia.edu
+February 24, 1999
+
+(derived from the OPL3-SA2 documentation by Scott Murray)
+
+The SoundPro CMI8330 (ISA) is a chip usually found on some Taiwanese
+motherboards.  The official name in the documentation is CMI8330, SoundPro
+is the nickname and the big inscription on the chip itself.
+
+The chip emulates a WSS as well as a SB16, but it has certain differences
+in the mixer section which require separate support. It also emulates an
+MPU401 and an OPL3 synthesizer, so you probably want to enable support
+for these, too.
+
+The chip identifies itself as an AD1848, but its mixer is significantly
+more advanced than the original AD1848 one. If your system works with
+either WSS or SB16 and you are having problems with some mixer controls
+(no CD audio, no line-in, etc), you might want to give this driver a try.
+Detection should work, but it hasn't been widely tested, so it might still
+mis-identify the chip. You can still force soundpro=1 in the modprobe
+parameters for ad1848. Please let me know if it happens to you, so I can
+adjust the detection routine.
+
+The chip is capable of doing full-duplex, but since the driver sees it as an
+AD1848, it cannot take advantage of this.  Moreover, the full-duplex mode is
+not achievable through the WSS interface, b/c it needs a dma16 line which is
+assigned only to the SB16 subdevice (with isapnp). Windows documentation
+says the user must use WSS Playback and SB16 Recording for full-duplex, so
+it might be possible to do the same thing under Linux. You can try loading
+up both ad1848 and sb then use one for playback and the other for
+recording. I don't know if this works, b/c I haven't tested it. Anyway, if
+you try it, be very careful: the SB16 mixer *mostly* works, but certain
+settings can have unexpected effects. Use the WSS mixer for best results.
+
+There is also a PCI SoundPro chip. I have not seen this chip, so I have
+no idea if the driver will work with it. I suspect it won't.
+
+As with PnP cards, some configuration is required.  There are two ways
+of doing this.  The most common is to use the isapnptools package to
+initialize the card, and use the kernel module form of the sound
+subsystem and sound drivers.  Alternatively, some BIOS's allow manual
+configuration of installed PnP devices in a BIOS menu, which should
+allow using the non-modular sound drivers, i.e. built into the kernel.
+Since in this latter case you cannot use module parameters, you will
+have to enable support for the SoundPro at compile time.
+
+The IRQ and DMA values can be any that are considered acceptable for a
+WSS.  Assuming you've got isapnp all happy, then you should be able to
+do something like the following (which *must* match the isapnp/BIOS
+configuration):
+
+modprobe ad1848 io=0x530 irq=11 dma=0 soundpro=1
+-and maybe-
+modprobe sb io=0x220 irq=5 dma=1 dma16=5
+
+-then-
+modprobe mpu401 io=0x330 irq=9
+modprobe opl3 io=0x388
+
+If all goes well and you see no error messages, you should be able to
+start using the sound capabilities of your system.  If you get an
+error message while trying to insert the module(s), then make
+sure that the values of the various arguments match what you specified
+in your isapnp configuration file, and that there is no conflict with
+another device for an I/O port or interrupt.  Checking the contents of
+/proc/ioports and /proc/interrupts can be useful to see if you're
+butting heads with another device.
+
+If you do not see the chipset version message, and none of the other
+messages present in the system log are helpful, try adding 'debug=1'
+to the ad1848 parameters, email me the syslog results and I'll do
+my best to help. 
+
+Lastly, if you're using modules and want to set up automatic module
+loading with kmod, the kernel module loader, here is the section I
+currently use in my conf.modules file:
+
+# Sound
+post-install sound modprobe -k ad1848; modprobe -k mpu401; modprobe -k opl3
+options ad1848 io=0x530 irq=11 dma=0
+options sb io=0x220 irq=5 dma=1 dma16=5
+options mpu401 io=0x330 irq=9
+options opl3 io=0x388
+
+The above ensures that ad1848 will be loaded whenever the sound system
+is being used.
+
+Good luck.
+
+Ion
+
+NOT REALLY TESTED:
+- recording
+- recording device selection
+- full-duplex
+
+TODO:
+- implement mixer support for surround, loud, digital CD switches.
+- come up with a scheme which allows recording volumes for each subdevice.
+This is a major OSS API change.
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index ed53d96c7..601b91a29 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -23,6 +23,8 @@ Currently, these files are in /proc/sys/fs:
 - inode-max
 - inode-nr
 - inode-state
+- overflowuid
+- overflowgid
 - super-max
 - super-nr
 
@@ -117,6 +119,18 @@ more.
 
 ==============================================================
 
+overflowgid & overflowuid:
+
+Some filesystems only support 16-bit UIDs and GIDs, although in Linux
+UIDs and GIDs are 32 bits. When one of these filesystems is mounted
+with writes enabled, any UID or GID that would exceed 65535 is translated
+to a fixed value before being written to disk.
+
+These sysctls allow you to change the value of the fixed UID and GID.
+The default is 65534.
+
+==============================================================
+
 super-max & super-nr:
 
 These numbers control the maximum number of superblocks, and
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 01fbbc9c4..171578283 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -28,6 +28,8 @@ show up in /proc/sys/kernel:
 - modprobe                    ==> Documentation/kmod.txt
 - osrelease
 - ostype
+- overflowgid
+- overflowuid
 - panic
 - powersave-nap               [ PPC only ]
 - printk
@@ -126,6 +128,18 @@ The only way to tune these values is to rebuild the kernel :-)
 
 ==============================================================
 
+overflowgid & overflowuid:
+
+if your architecture did not always support 32-bit UIDs (i.e. arm, i386,
+m68k, sh, and sparc32), a fixed UID and GID will be returned to
+applications that use the old 16-bit UID/GID system calls, if the actual
+UID or GID would exceed 65535.
+
+These sysctls allow you to change the value of the fixed UID and GID.
+The default is 65534.
+
+==============================================================
+
 panic:
 
 The value in this file represents the number of seconds the
diff --git a/Documentation/usb/CREDITS b/Documentation/usb/CREDITS
index 04e67607c..738b55efc 100644
--- a/Documentation/usb/CREDITS
+++ b/Documentation/usb/CREDITS
@@ -4,13 +4,18 @@ The following people have contributed to this code (in alphabetical
 order by last name).  I'm sure this list should be longer, its
 difficult to maintain, add yourself with a patch if desired.
 
+  Georg Acher <acher@informatik.tu-muenchen.de>
   Alan Cox <alan@lxorguk.ukuu.org.uk>
+  Randy Dunlap <randy.dunlap@intel.com>
   Johannes Erdfelt <jerdfelt@sventech.com>
+  Deti Fliegl <deti@fliegl.de>
   ham <ham@unsuave.com>
   Bradley M Keryan <keryan@andrew.cmu.edu>
+  Greg Kroah-Hartman <greg@kroah.com>
   Paul Mackerras <paulus@cs.anu.edu.au>
   David E. Nelson <dnelson@jump.net>
   Vojtech Pavlik <vojtech@suse.cz>
+  Thomas Sailer <sailer@ife.ee.ethz.ch>
   Gregory P. Smith <greg@electricrain.com>
   Linus Torvalds <torvalds@transmeta.com>
   Roman Weissgaerber <weissg@vienna.at>
@@ -101,6 +106,9 @@ THANKS file in Inaky's driver):
         - Thanks to Entrega for providing PCI to USB cards, hubs and
           converter products for development. 
 
+	- Thanks to ConnectTech for providing a WhiteHEAT usb to
+	  serial converter, and the documentation for the device to
+	  allow a driver to be written.
 
         And thanks go to (hey! in no particular order :)
 
@@ -157,4 +165,3 @@ THANKS file in Inaky's driver):
           for convincing me USB Standard hubs are not that standard
           and that's good to allow for vendor specific quirks on the
           standard hub driver.
-
diff --git a/Documentation/usb/dc2xx.txt b/Documentation/usb/dc2xx.txt
index 25b024123..42c840ee5 100644
--- a/Documentation/usb/dc2xx.txt
+++ b/Documentation/usb/dc2xx.txt
@@ -1,4 +1,4 @@
-13 November 1999
+19 January 2000
 david-b@pacbell.net
 
 This is an overview of how to use the "dc2xx" USB driver with certain
@@ -15,14 +15,13 @@ You'll most likely want to hook it up to recent versions of "gPhoto"
 (www.gphoto.org), since version 0.4 and later know how to use it to talk
 to Kodak DC-240 and DC-280 cameras over USB.
 
-In addition the DC-260, DC-265, and DC-290 are currently recognized.
+In addition the DC-220, DC-260, DC-265, and DC-290 are also recognized.
 However, like other cameras using the "Digita OS" (from www.flashpoint.com)
 there is no gPhoto support for this camera.  At this writing the best
 known support for these cameras is a Python script that supports image
 downloading from those cameras.  (See archives of the linux-usb mailing
-list.)  The DC-220 should also work with this driver, given information
-about the USB product IDs.  When it becomes available, the HP PhotoSmart
-C500 should also work ... it's another Digita OS camera with USB support.)
+list.)  When it becomes available, the HP PhotoSmart C500 should also
+work ... it's another Digita OS camera with USB support.
 
 It's likely that other digital still cameras can also use this USB driver,
 even if they're not from Kodak and don't use Digita.  The reason is that
@@ -35,30 +34,33 @@ USB HARDWARE
 
 This has been shown to work on x86 OHCI and UHCI (Intel) chipsets.  OHCI has
 been trouble free; not so with UHCI, which was first seen to be happy with
-2.3.24 kernels, and has not been as fast as OHCI.
+2.3.24 kernels, and has not been as fast as OHCI.  Users on the PowerMac
+platform have had success, although the stock kernel doesn't yet support
+that platform.
 
 Note that in some cases changes in BIOS settings may be needed before
 your USB works.  At least one user has reported a need for SMP-related 
 settings as well.
 
-As yet, no reports have come from Linux users on non-Intel hardware.
-(You could color coordinate your iMac with a DC-240i ... :-)
-
 
 SETUP
 
-Configure in the DC2XX USB driver, and have it in your kernel.  Recently I
-compile it right in, but I've done it as a module in the past.
+Configure in the DC2XX USB driver, and have it in your kernel.  It works
+as a module, or compiled in directly.
 
-Create a device, perhaps like this (both read and write):
+Create at least one device, perhaps like this (both read and write):
 
-    # mknod -m 0666 /dev/kodak c 10 170
+    # mknod -m 0666 /dev/kodak00 c 180 80
+    # mknod -m 0666 /dev/kodak01 c 180 81
+    ...
 
-That "170" is not formally assigned, and this command may change.  If you're
-using a non-Kodak camera, you may prefer another name.
+The driver supports multiple device nodes.  The USB framework supports
+a maximum of sixteen device nodes (up to minor device number 96), though
+by default fewer devices are available.
 
-Don't plug in more than one compatible camera at this time.  One of them
-will be ignored, but I'd not be sure which one!
+When you plug in one camera, it will use the first device node (kodak00
+in the example above).  A second camera will use the second device node,
+and so on.
 
 
 SANITY TESTING
@@ -66,14 +68,11 @@ SANITY TESTING
 First:  if you've got /proc support, make sure that the driver has hooked
 itself up correctly.
 
-    - you should see an entry in /proc/misc for the a Kodak DC-2xx
-      minor device number
-
-    - you should see an entry in /proc/bus/usb/drivers for "dc2xx",
-      if you also enabled USB /proc support.
+    - You should see an entry in /proc/bus/usb/drivers for "dc2xx",
+      if you enabled USB /proc support.
 
 Second:  when you connect your camera to the computer, does it get recognized
-by the driver?
+by the driver?  (Make sure the camera is powered on!)
 
     - if you've got /proc/bus/usb/devices, you should see an entry
       something like this.  The "ProdID" may be different if you didn't
@@ -87,19 +86,16 @@ by the driver?
 	E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
 	E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
 
-    - if you don't have /proc support for USB, see if "dmesg" output
-      tells you that you plugged in your camera.
+    - see if "dmesg" output tells you that you plugged in your camera.
 
-	USB new device connect, assigned device number 1
 	Manufacturer: Eastman Kodak Company
 	Product: KODAK DC240 Zoom Digital Camera
-	USB Camera is connected
-	usbcore: dc2xx driver claimed interface c3a68600
-	ohci-control thread sleeping
+	Serial Number: ?
+	dc2xx.c: USB Camera #0 connected
 
 Third:  (optional) can you use gPhoto to talk to the camera?
 
-    - When you configure your camera, tell it to use "/dev/kodak" (or
+    - When you configure your camera, tell it to use "/dev/kodak00" (or
       whatever name you used).  Right now, gPhoto emits a diagnostic
       message (non-GUI) saying that it since it didn't act like a TTY,
       it's assuming it's got a USB connection.
@@ -108,3 +104,10 @@ Third:  (optional) can you use gPhoto to talk to the camera?
       talk to the camera -- and tell you you're using USB.
 
 If you got that far, you should be able to use everything fine.
+
+
+ADDITIONAL INFORMATION
+
+You may find that you need more driver-specific information, which is
+currently accessible through a link from http://www.linux-usb.org/
+along with other Linux USB resources.
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index 14163ae87..3a73afc0d 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -2,22 +2,29 @@
 Readme for Linux device driver for the OmniVision OV511 USB to camera bridge IC
 -------------------------------------------------------------------------------
 
+Author: Mark McClelland
+Homepage: http://people.delphi.com/mmcclelland/linux/
+
 INTRODUCTION:
 
-This is a preliminary version of my OV511 Linux device driver. At the moment,
-it does not do much more than detect the chip and initialize it. As trivial
-as this sounds, it represents many hours of my work. Since OmniVision refused
-to release the full specs to me, I had to write code to probe out the register
-read/write commands. Some code is in place to allow a frame to be grabbed, but
-it is nowhere near complete.
+This is a preliminary version of my OV511 Linux device driver. Currently, it can
+grab a frame in color (YUV420) at 640x480 or 320x240 using either vidcat or
+xawtv. Other utilities may work but have not yet been tested.
+
+NOTE: 320x240 does not work reliably for me, and causes complete system crashes.
+      I recommend not using it until a later version, and if you do, run "sync"
+      first.
 
 SUPPORTED CAMERAS:
-____________________________________________
-Manufacturer     | Model        | Custom ID 
------------------+--------------+-----------
-D-Link           | DSB-C300	    | 3
-Creative Labs    | WebCam 3     | 21
---------------------------------------------
+________________________________________________________
+Manufacturer     | Model          | Custom ID | Status
+-----------------+----------------+-----------+---------
+MediaForte       | MV300          | 0         | Untested
+D-Link           | DSB-C300       | 3         | Working
+Creative Labs    | WebCam 3       | 21        | Working
+Lifeview         | RoboCam        | 100       | Untested
+AverMedia        | InterCam Elite | 102       | Working
+--------------------------------------------------------
 
 Any camera using the OV511 and the OV7610 CCD should work with this driver. The
 driver only detects known cameras though, based on their custom id number. If
@@ -31,23 +38,56 @@ WHAT YOU NEED:
 - If you want to help with the development, get the chip's specification docs at
   http://www.ovt.com/omniusbp.html
 
-- A Video4Linux compatible frame grabber program (I recommend vidcat)
+- A Video4Linux compatible frame grabber program (I recommend vidcat and xawtv)
   (see: http://www.exploits.org/v4l/ )
-  
-WHAT NEEDS TO BE DONE:
 
-In short, a lot. 
+HOW TO USE IT:
+
+You must have first compiled USB support, support for your specific USB host
+controller (UHCI or OHCI), and Video4Linux support for your kernel (I recommend
+making them modules.) 
+
+Next, (as root) from your appropriate modules directory (lib/modules/2.3.XX):
+
+	insmod usb/usbcore.o
+	insmod usb/usb-uhci.o  <OR>  insmod usb/ohci-hcd.o
+	insmod misc/videodev.o
+	insmod usb/ov511.o
+
+If it is not already there (it usually is), create the video device:
 
-UPDATE:
-Currently, the control messages are working fine ("vendor commands"; for
-reading and writing the OV511 registers.) The I2C bus commands for reading and
-writing the camera (OV7610) registers are implemented and working, with at least
-one person's camera. The isochronous-in endpoint for video data is finally
-producing data, but since ov511_parse_data() is not implemented you will not see
-a picture yet.
+	mknod /dev/video c 81 0
+	
+Now you are ready to run a video app! Both vidcat and xawtv work well for me
+at 640x480.
+	
+[Using vidcat:]
 
-Support for specific CCD's will have to be implemented as well (such as the
-OV7610.) 
+	vidcat -s 640x480 > test.jpg
+	xview test.jpg
+	
+[Using xawtv:]
+
+You must make some modifications to the source and compile it before you use it.
+(Note: this may not be applicable to versions other than 3.06)
+
+In src/Xawtv.ad, change xawtv.tv.width to 640 and xawtv.tv.height to 480. Next,
+in src/grab-v4l.c, change SYNC_TIMEOUT from 1 to 2. Then, from the main xawtv
+directory:
+
+	make clean
+	./configure
+	make
+	make install
+
+Now you should be able to run xawtv. Right click for the options dialog.
+
+WORKING FEATURES:
+ o Color streaming/capture at 640x480 (reliably) and 320x240 (unreliably)
+ o YUV420 color
+ o Setting/getting of saturation, contrast and brightness (no color yet)
+
+WHAT NEEDS TO BE DONE:
 
 The rest of the work will involve implementing support for all the different
 resolutions, color depths, etc. Also, while support for the OV511's proprietary
@@ -66,5 +106,5 @@ CREDITS:
 
 The code is based in no small part on the CPiA driver by Johannes Erdfelt,
 Randy Dunlap, and others. Big thanks to them for their pioneering work on that
-and the USB stack. Thanks to Bret Wallach for getting camera reg IO and ISOC
-working.
+and the USB stack. Thanks to Bret Wallach for getting camera reg IO , ISOC, and
+image capture working.
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 053f18d2e..e046ae2e5 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -1,42 +1,115 @@
-This serial driver currently only works with the Belkin and Peracom USB 
-Serial devices. It should also work for the Etek converter, but I do 
-not know the vendor id and device id of that device (if anyone does, 
-please let me know.)
-
-If your device is not compatible with the above models, you can try
-out the "generic" interface. This interface does not provide any type
-of control messages sent to the device, and does not support any kind
-of device flow control. All that is required of your device is that
-it has at least one bulk in endpoint, or one bulk out endpoint.
-To enable the driver to recognize your device, build the driver as
-a module and load it by the following invocation:
-	insmod usb-serial.o vendor=0x#### product=0x####
-where the #### is replaced with the hex representation of your device's
-vendor id and product id.
-
-The driver can handle enumerating the device, and sending and receiving
-data from the converter. However, since I do not have a spec for the Belkin,
-Peracom, and eTek devices, and the raw dumps from the Win98 driver are 
-confusing, and eTek keeps giving me the run around, no control signals are 
-currently handled, and the data will most likely come through on a baud
-rate that you are not expecting. So if you have these devices, do not 
-expect the correct data to show up at either end. 
-
-The major number that the driver uses is 188 so to use the driver, create
-the following nodes:
-mknod /dev/ttyUSB0 c 188 0
-mknod /dev/ttyUSB1 c 188 1
-mknod /dev/ttyUSB2 c 188 2
-mknod /dev/ttyUSB3 c 188 3
-
-then plug in a device and use your friendly terminal program to see what
-happens.
-
-If anyone has any problems getting the device to enumerate, or data to 
-flow through it, please contact me.
-
-
-
-greg k-h
-greg@kroah.com
+INTRODUCTION
+
+  The USB serial driver currently supports a number of different USB to
+  serial converter products, as well as some devices that use a serial
+  interface from userspace to talk to the device.
+
+  See the individual product section below for specific information about
+  the different devices.
+
+
+CONFIGURATION
+
+  Currently the driver can handle up to 16 different serial interfaces at
+  one time. Once more of the drivers become stable, this number will be
+  increased to the full 256. 
+
+  The major number that the driver uses is 188 so to use the driver,
+  create the following nodes:
+	mknod /dev/ttyUSB0 c 188 0
+	mknod /dev/ttyUSB1 c 188 1
+	mknod /dev/ttyUSB2 c 188 2
+	mknod /dev/ttyUSB3 c 188 3
+	mknod /dev/ttyUSB4 c 188 4
+	mknod /dev/ttyUSB5 c 188 5
+	mknod /dev/ttyUSB6 c 188 6
+	mknod /dev/ttyUSB7 c 188 7
+	mknod /dev/ttyUSB8 c 188 8
+	mknod /dev/ttyUSB9 c 188 9
+	mknod /dev/ttyUSB10 c 188 10
+	mknod /dev/ttyUSB11 c 188 11
+	mknod /dev/ttyUSB12 c 188 12
+	mknod /dev/ttyUSB13 c 188 13
+	mknod /dev/ttyUSB14 c 188 14
+	mknod /dev/ttyUSB15 c 188 15
+	mknod /dev/ttyUSB16 c 188 16
+
+
+SPECIFIC DEVICES SUPPORTED
+
+
+ConnectTech WhiteHEAT 4 port converter
+
+  ConnectTech has been very forthcoming with information about their
+  device, including providing a unit to test with. This driver will end up
+  being fully supported.
+
+Current status:
+  The device's firmware is downloaded on connection, but the use of a
+  special Anchor Chips extension is currently giving me problems.
+  This driver is not fully operational.
+
 
+HandSpring Visor USB docking station
+
+Current status:
+  Only when the Visor tries to connect to the host, does the docking
+  station show up as a valid USB device. When this happens, the device is
+  properly enumerated, assigned a port, and then communication _should_ be
+  possible. The driver cleans up properly when the device is removed, or
+  the connection is canceled on the Visor.
+  
+  I write _should_ because communication does not seem to work properly at
+  this time. I am in contact with the developers at HandSpring and am
+  working at getting this to work properly.
+
+  There is a webpage for this portion of the driver at 
+  http://milosch.net/visor/ and a project set up with mailing lists for
+  it at :
+  http://sourceforge.net/project/?group_id=1404
+
+
+Belkin single port serial converter
+Peracom single port serial converter
+
+Current status:
+  The driver can handle enumerating the device, and sending and receiving
+  data from the converter. However, since I do not have a spec for the
+  Belkin, Peracom, and eTek devices, and the raw dumps from the Win98
+  driver are confusing, and eTek refuses to provide documentation on their
+  protocol, no control signals are currently handled, and the data will
+  most likely come through on a baud rate that you are not expecting. So
+  if you have these devices, do not expect the correct data to show up at 
+  either end. 
+  
+
+Generic Serial driver
+
+  If your device is not one of the above listed devices, compatible with
+  the above models, you can try out the "generic" interface. This
+  interface does not provide any type of control messages sent to the
+  device, and does not support any kind of device flow control. All that
+  is required of your device is that it has at least one bulk in endpoint,
+  or one bulk out endpoint. 
+  
+  To enable the generic driver to recognize your device, build the driver
+  as a module and load it by the following invocation:
+	insmod usb-serial vendor=0x#### product=0x####
+  where the #### is replaced with the hex representation of your device's
+  vendor id and product id.
+
+  This driver has been successfully used to connect to the NetChip USB
+  development board, providing a way to develop USB firmware without
+  having to write a custom driver.
+
+
+CONTACT:
+
+  If anyone has any problems using this driver, with any of the above
+  specified products, please contact me, or join the Linux-USB mailing
+  list (information on joining the mailing list, as well as a link to its
+  searchable archive is at http://www.linux-usb.org/ )
+
+
+Greg Kroah-Hartman
+greg@kroah.com
diff --git a/Documentation/video4linux/bttv/CARDLIST b/Documentation/video4linux/bttv/CARDLIST
index 5fd5b826b..0176ecf0e 100644
--- a/Documentation/video4linux/bttv/CARDLIST
+++ b/Documentation/video4linux/bttv/CARDLIST
@@ -23,7 +23,7 @@ bttv.o
   card=21 - Lucky Star Image World ConferenceTV
   card=22 - Phoebe Tv Master + FM
   card=23 - Modular Technology MM205 PCTV, bt878
-  card=24 - Magic TView CPH061 (bt878)
+  card=24 - Askey/Typhoon/Anubis Magic TView CPH051/061 (bt878)
   card=25 - Terratec/Vobis TV-Boostar
   card=26 - Newer Hauppauge WinCam (bt878)
   card=27 - MAXI TV Video PCI2
@@ -32,8 +32,7 @@ bttv.o
   card=30 - FlyVideo 98
   card=31 - iProTV
   card=32 - Intel Create and Share PCI
-  card=33 - Askey/Typhoon/Anubis Magic TView
-  card=34 - Terratec TerraTValue
+  card=33 - Terratec TerraTValue
 
 tuner.o
   type=0 - Temic PAL
diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README
index 00b23c52a..8b9170e3d 100644
--- a/Documentation/video4linux/bttv/README
+++ b/Documentation/video4linux/bttv/README
@@ -49,7 +49,7 @@ Insmod-options:	list of all insmod options available for bttv and
 MAKEDEV:	a script to create the special files for v4l
 CARDLIST:	List of all supported cards
 
-Loading just the bttv modules isn't enough for most cards.  The
+Loading just the bttv modules isn't enouth for most cards.  The
 drivers for the i2c tuner/sound chips must also be loaded.  bttv tries
 to load them automagically by calling request_module() now, but this
 obviously works only with kmod enabled.
diff --git a/Documentation/vm/locking b/Documentation/vm/locking
index 54c8a6ce0..125cde7cd 100644
--- a/Documentation/vm/locking
+++ b/Documentation/vm/locking
@@ -8,14 +8,14 @@ vmlist_access_lock/vmlist_modify_lock
 --------------------------------------
 
 Page stealers pick processes out of the process pool and scan for 
-the best process to steal pages from. To guarantee the existance 
+the best process to steal pages from. To guarantee the existence 
 of the victim mm, a mm_count inc and a mmdrop are done in swap_out().
 Page stealers hold kernel_lock to protect against a bunch of races.
 The vma list of the victim mm is also scanned by the stealer, 
 and the vmlist_lock is used to preserve list sanity against the
-process adding/deleting to the list. This also gurantees existance
-of the vma. Vma existance is not guranteed once try_to_swap_out() 
-drops the vmlist lock. To gurantee the existance of the underlying 
+process adding/deleting to the list. This also guarantees existence
+of the vma. Vma existence is not guaranteed once try_to_swap_out() 
+drops the vmlist lock. To guarantee the existence of the underlying 
 file structure, a get_file is done before the swapout() method is 
 invoked. The page passed into swapout() is guaranteed not to be reused
 for a different purpose because the page reference count due to being
@@ -102,7 +102,7 @@ counts on the corresponding swaphandles, maintained in the "swap_map"
 array, and the "highest_bit" and "lowest_bit" fields.
 
 Both of these are spinlocks, and are never acquired from intr level. The
-locking heirarchy is swap_list_lock -> swap_device_lock.
+locking hierarchy is swap_list_lock -> swap_device_lock.
 
 To prevent races between swap space deletion or async readahead swapins
 deciding whether a swap handle is being used, ie worthy of being read in
author	Ralf Baechle <ralf@linux-mips.org>	2000-02-16 01:07:24 +0000
committer	Ralf Baechle <ralf@linux-mips.org>	2000-02-16 01:07:24 +0000
commit	95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree	27a92a942821cde1edda9a1b088718d436b3efe4 /Documentation
parent	45b27b0a0652331d104c953a5b192d843fff88f8 (diff)