Merge with Linux 2.4.0-test6-pre1.

21 files changed, 41 insertions, 41 deletions

diff --git a/Documentation/networking/README.sb1000 b/Documentation/networking/README.sb1000
index 37c39a0c8..f82d42584 100644
--- a/Documentation/networking/README.sb1000
+++ b/Documentation/networking/README.sb1000
@@ -30,7 +30,7 @@ cable modem easy.
       http://home.adelphia.net/~siglercm/sb1000.html
       http://linuxpower.cx/~cable/
 
-   along with these utilties.
+   along with these utilities.
 
 3.) The standard isapnp tools.  These are necessary to configure your SB1000
 card at boot time (or afterwards by hand) since it's a PnP card.
diff --git a/Documentation/networking/comx.txt b/Documentation/networking/comx.txt
index a58e78d90..38ad51622 100644
--- a/Documentation/networking/comx.txt
+++ b/Documentation/networking/comx.txt
@@ -63,7 +63,7 @@ values upon creation, so you don't necessarily have to change all of them.
 
 When you're ready with filling in the files in the comx[n] directory, you can
 configure the corresponding network interface with the standard network 
-configuration utilites. If you're unble to bring the interfaces up, look up
+configuration utilities. If you're unable to bring the interfaces up, look up
 the various kernel log files on your system, and consult the messages for
 a probable reason.
 
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 24f15cb71..aaccf6bc0 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -214,7 +214,7 @@ Example:
 

     insmod cs89x0.o io=0x200 irq=0xA media=aui

 

-This exmaple loads the module and configures the adapter to use an IO port base

+This example loads the module and configures the adapter to use an IO port base

 address of 200h, interrupt 10, and use the AUI media connection.  The following

 configuration options are available on the command line:

 

@@ -259,7 +259,7 @@ e) The minimum command-line configuration required if an EEPROM is
    irq 

    media type (no autodetect)

 

-f) The following addtional parameters are CS89XX defaults (values

+f) The following additional parameters are CS89XX defaults (values

    used with no EEPROM or command-line argument).

 

    * DMA Burst = enabled

diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index 3a4116310..a2b050be9 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -44,7 +44,7 @@ The kernel command line takes options looking like the following:
 the 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
+use almost any character except space, although a `.` would be the most
 obvious choice :-)
 
 There used to be a third number specifying the node type. This option
diff --git a/Documentation/networking/dmfe.txt b/Documentation/networking/dmfe.txt
index c8e561596..c0e839867 100644
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
@@ -25,7 +25,7 @@
             -Wall -Wstrict-prototypes -O6 -c dmfe.c"
 
 
-  B. The following steps teach you how to active DM9102 board:
+  B. The following steps teach you how to activate a DM9102 board:
 
         1. Used the upper compiler command to compile dmfe.c
 
@@ -40,13 +40,13 @@
            "ifconfig eth0 172.22.3.18"
                           ^^^^^^^^^^^ Your IP address
 
-        4. Active the IP routing table. For some distributions, it is not
+        4. Activate the IP routing table. For some distributions, it is not
            necessary. You can type "route" to check.
 
            "route add default eth0"
 
 
-        5. Well done. Your DM9102 adapter actived now.
+        5. Well done. Your DM9102 adapter is now activated.
 
 
    C. Object files description:
diff --git a/Documentation/networking/ethertap.txt b/Documentation/networking/ethertap.txt
index 7af37a004..653f043a7 100644
--- a/Documentation/networking/ethertap.txt
+++ b/Documentation/networking/ethertap.txt
@@ -1,7 +1,7 @@
 Documentation on setup and use of EtherTap.
 
 Contact Jay Schulist <jschlst@turbolinux.com> if you
-have questions or need futher assistance.
+have questions or need further assistance.
 
 Introduction
 ============
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 482fbecb0..e1436a7bb 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -88,7 +88,7 @@ tcp_keepalive_interval - INTEGER
 	will be aborted after ~11 minutes of retries.
 
 tcp_retries1 - INTEGER
-	How many times to retry before deciding that somethig is wrong
+	How many times to retry before deciding that something is wrong
 	and it is necessary to report this suspection to network layer.
 	Minimal RFC value is 3, it is default, which corresponds
 	to ~3sec-8min depending on RTO.
@@ -139,13 +139,13 @@ tcp_max_orphans - INTEGER
 	(probably, after increasing installed memory),
 	if network conditions require more than default value,
 	and tune network services to linger and kill such states
-	more aggressivley. Let me to remind again: each orphan eats
+	more aggressively. Let me to remind again: each orphan eats
 	up to ~64K of unswappable memory.
 
 tcp_abort_on_overflow - BOOLEAN
 	If listening service is too slow to accept new connections,
 	reset them. Default state is FALSE. It means that if overflow
-	occured due to a burst, connection will recover. Enable this
+	occurred due to a burst, connection will recover. Enable this
 	option _only_ if you are really sure that listening daemon
 	cannot be tuned to accept connections faster. Enabling this
 	option can harm clients of your server.
@@ -179,7 +179,7 @@ tcp_stdurg - BOOLEAN
 	
 tcp_max_syn_backlog - INTEGER
 	Maximal number of remembered connection requests, which are
-	still did not receive an acknowldgement from connecting client.
+	still did not receive an acknowledgement from connecting client.
 	Default value is 1024 for systems with more than 128Mb of memory,
 	and 128 for low memory machines. If server suffers of overload,
 	try to increase this number. Warning! If you make it greater
diff --git a/Documentation/networking/ipddp.txt b/Documentation/networking/ipddp.txt
index 8df88a7df..5fb6c3c74 100644
--- a/Documentation/networking/ipddp.txt
+++ b/Documentation/networking/ipddp.txt
@@ -1,7 +1,7 @@
 Text file for ipddp.c:
 	AppleTalk-IP Decapsulation and AppleTalk-IP Encapsulation
 
-This text file writen by Jay Schulist <jschlst@turbolinux.com>
+This text file is written by Jay Schulist <jschlst@turbolinux.com>
 
 Introduction
 ------------
diff --git a/Documentation/networking/iphase.txt b/Documentation/networking/iphase.txt
index 94356d67d..39ccb8595 100644
--- a/Documentation/networking/iphase.txt
+++ b/Documentation/networking/iphase.txt
@@ -137,7 +137,7 @@ Installation
          -Pcbr:max_pcr=<xxx>
          where:
              xxx = the maximum peak cell rate, from 170 - 353207.
-         This option may only be set on the trasmit machine.
+         This option may only be set on the transmit machine.
 
 
 OUTSTANDING ISSUES
diff --git a/Documentation/networking/olympic.txt b/Documentation/networking/olympic.txt
index 04198aec5..63806258a 100644
--- a/Documentation/networking/olympic.txt
+++ b/Documentation/networking/olympic.txt
@@ -38,14 +38,14 @@ the driver now re-sizes buffers based on MTU settings as well.
 message_level: Controls level of messages created by the driver. Defaults to 0:
 which only displays start-up and critical messages.  Presently any non-zero 
 value will display all soft messages as well.  NB This does not turn 
-debuging messages on, that must be done by modified the source code.
+debugging messages on, that must be done by modified the source code.
 
 Multi-card:
 
 The driver will detect multiple cards and will work with shared interrupts,
 each card is assigned the next token ring device, i.e. tr0 , tr1, tr2.  The 
 driver should also happily reside in the system with other drivers.  It has 
-been tested with ibmtr.c running, and I personnally have had one Olicom PCI 
+been tested with ibmtr.c running, and I personally have had one Olicom PCI 
 card and two IBM olympic cards (all on the same interrupt), all running
 together. 
 
@@ -68,7 +68,7 @@ mode.  All unexpected MAC frames (beaconing etc.) will be received
 by the driver and the source and destination addresses printed. 
 Also an entry will be added in  /proc/net called olympic_tr. This 
 displays low level information about the configuration of the ring and
-the adapter. This feature has been designed for network adiministrators
+the adapter. This feature has been designed for network administrators
 to assist in the diagnosis of network / ring problems.
 
 6/8/99 Peter De Schrijver and Mike Phillips
diff --git a/Documentation/networking/shaper.txt b/Documentation/networking/shaper.txt
index 1be0db8c0..6c4ebb66a 100644
--- a/Documentation/networking/shaper.txt
+++ b/Documentation/networking/shaper.txt
@@ -42,7 +42,7 @@ multiple route tables to get the flexibility.
 
 	There is no "borrowing" or "sharing" scheme. This is a simple
 traffic limiter. We implement Van Jacobson and Sally Floyd's CBQ
-architecture into Linux 2.2. THis is the preferred solution. Shaper is
+architecture into Linux 2.2. This is the preferred solution. Shaper is
 for simple or back compatible setups.
 
 Alan
diff --git a/Documentation/networking/sis900.txt b/Documentation/networking/sis900.txt
index b353eaa3b..6c26c9927 100644
--- a/Documentation/networking/sis900.txt
+++ b/Documentation/networking/sis900.txt
@@ -161,7 +161,7 @@
 
   Silicon Integrated System Corp. is cooperating closely with core Linux
   Kernel developers. The revisions of SiS 900 driver are distributed by
-  the usuall channels for kernel tar files and patches. Those kernel tar
+  the usual channels for kernel tar files and patches. Those kernel tar
   files for official kernel and patches for kernel pre-release can be
   download at official kernel ftp site
   <http://ftp.kernel.org/pub/linux/kernel/> and its mirrors.  The 1.06
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
index 510d2c4ef..2af3964ef 100644
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
@@ -138,7 +138,7 @@ Insert a line of the form:
 options sk98lin ...
 
 For "...", use the same syntax as described below for the command
-line paramaters of insmod.
+line parameters of insmod.
 You either have to reboot your computer or unload and reload
 the driver to activate the new parameters.
 The syntax of the driver parameters is:
@@ -187,7 +187,7 @@ which you set the parameter (A or B).
   this port is not "Sense". If autonegotiation is "On", all
   three values are possible. If it is "Off", only "Full" and
   "Half" are allowed.
-  It is usefull if your link partner does not support all
+  It is useful if your link partner does not support all
   possible combinations.
 
 - Flow Control
@@ -269,7 +269,7 @@ which you set the parameter (A or B).
 
 Large frames (also called jumbo frames) are now supported by the
 driver. This can result in a greatly improved throughput if
-transfering large amounts of data.
+transferring large amounts of data.
 To enable large frames, set the MTU (maximum transfer unit)
 of the interface to the value you wish (up to 9000). The command
 for this is:
@@ -285,7 +285,7 @@ it will simply drop them.
 You can switch back to the standard ethernet frame size with:
   ifconfig eth0 mtu 1500
 
-To make this setting persitent, add a script with the 'ifconfig'
+To make this setting persistent, add a script with the 'ifconfig'
 line to the system startup sequence (named something like "S99sk98lin"
 in /etc/rc.d/rc2.d).
 ***
diff --git a/Documentation/networking/smctr.txt b/Documentation/networking/smctr.txt
index 57dbe7a65..a393133a4 100644
--- a/Documentation/networking/smctr.txt
+++ b/Documentation/networking/smctr.txt
@@ -62,5 +62,5 @@ Errata:
 
 This driver is under the GNU General Public License. Its Firmware image is
 included as an initialized C-array and is licensed by SMC to the Linux
-users of this driver. However no waranty about its fitness is expressed or
+users of this driver. However no warranty about its fitness is expressed or
 implied by SMC.
diff --git a/Documentation/networking/tlan.txt b/Documentation/networking/tlan.txt
index 901eb44bc..d513191cd 100644
--- a/Documentation/networking/tlan.txt
+++ b/Documentation/networking/tlan.txt
@@ -51,7 +51,7 @@ II.   Driver Options
 	   0x01		Turn on general debugging messages.
 	   0x02		Turn on receive debugging messages.
 	   0x04		Turn on transmit debugging messages.
-	   0x08		Turn on list debugging messsages.
+	   0x08		Turn on list debugging messages.
 
 	2. You can append aui=1 to the end of the insmod line to cause
            the adapter to use the AUI interface instead of the 10 Base T
diff --git a/Documentation/networking/tms380tr.txt b/Documentation/networking/tms380tr.txt
index f73895f4f..7ae835331 100644
--- a/Documentation/networking/tms380tr.txt
+++ b/Documentation/networking/tms380tr.txt
@@ -10,8 +10,8 @@ Please point your browser to:
 http://www.linux-sna.org
 
 Many thanks to Christoph Goos for his excellent work on this driver and
-SysKonnect for donating the adapters to Linux-SNA for the testing and maintaince
-of this device driver.
+SysKonnect for donating the adapters to Linux-SNA for the testing and 
+maintenance of this device driver.
 
 Important information to be noted:
 1. Adapters can be slow to open (~20 secs) and close (~5 secs), please be 
@@ -52,7 +52,7 @@ to http://www.syskonnect.com
 
 This driver is under the GNU General Public License. Its Firmware image is 
 included as an initialized C-array and is licensed by SysKonnect to the Linux 
-users of this driver. However no waranty about its fitness is expressed or 
+users of this driver. However no warranty about its fitness is expressed or 
 implied by SysKonnect.
 
 Below find attached the setting for the SK NET TR 4/16 ISA adapters
diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt
index 35d5dea65..b5a625422 100644
--- a/Documentation/networking/tulip.txt
+++ b/Documentation/networking/tulip.txt
@@ -170,7 +170,7 @@ Version history
 
 0.9.4.3 (April 14, 2000):
 * mod_timer fix (Hal Murray)
-* PNIC2 resusitation (Chris Smith)
+* PNIC2 resuscitation (Chris Smith)
 
 0.9.4.2 (March 21, 2000):
 * Fix 21041 CSR7, CSR13/14/15 handling
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt
index 19d30079d..9a8039234 100644
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
@@ -8,7 +8,7 @@ driver for Linux, 3c59x.c.
 
 The driver was written by Donald Becker <becker@cesdis.gsfc.nasa.gov>
 
-Don is no longer the prime maintener of this version of the driver. 
+Don is no longer the prime maintainer of this version of the driver. 
 Please report problems to one or more of:
 
   Andrew Morton <andrewm@uow.edu.au>
@@ -64,7 +64,7 @@ its module is loaded.  These are usually placed in /etc/modules.conf
 
 options 3c59x debug=3 rx_copybreak=300
 
-If you are using the PCMCIA tools (cardmgr) then theoptions may be
+If you are using the PCMCIA tools (cardmgr) then the options may be
 placed in /etc/pcmcia/config.opts:
 
 module "3c59x" opts "debug=3 extra_reset=1"
@@ -135,7 +135,7 @@ rx_copybreak=M
 max_interrupt_work=N
 
   The driver's interrupt service routine can handle many receive and
-  transmit packets in a single invokation.  It does this in a loop. 
+  transmit packets in a single invocation.  It does this in a loop. 
   The value of max_interrupt_work governs how mnay times the interrupt
   service routine will loop.  The default value is 32 loops.  If this
   is exceeded the interrupt service routine gives up and generates a
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index f82ceb548..5cb1b3e42 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -142,11 +142,11 @@ REVISION HISTORY
 
 2.0.8   Nov 02, 1999            - Fixed up the X25API code.
                                 - Clear call bug fixed.i
-                                - Eanbled driver for multi-card
+                                - Enabled driver for multi-card
                                   operation.                                
 
 2.0.7   Aug 26, 1999		- Merged X25API code into WANPIPE.
-				- Fixed a memeory leak for X25API
+				- Fixed a memory leak for X25API
 				- Updated the X25API code for 2.2.X kernels.
 				- Improved NEM handling.
 
diff --git a/Documentation/networking/wanpipe.txt b/Documentation/networking/wanpipe.txt
index 7cb28178e..1fd1642d8 100644
--- a/Documentation/networking/wanpipe.txt
+++ b/Documentation/networking/wanpipe.txt
@@ -228,7 +228,7 @@ REVISION HISTORY
 				creating applications using BiSync
    				streaming.        
 
-2.0.5   Aug 04, 1999 		CHDLC initializatin bug fix.
+2.0.5   Aug 04, 1999 		CHDLC initialization bug fix.
 				PPP interrupt driven driver: 
   				Fix to the PPP line hangup problem.
 				New PPP firmware
@@ -241,13 +241,13 @@ REVISION HISTORY
 				Streaming HDLC API has been taken out.  
 				 Available as a patch.                 
 
-2.0.6   Aug 17, 1999		Increased debugging in statup scripts
-				Fixed insallation bugs from 2.0.5
+2.0.6   Aug 17, 1999		Increased debugging in startup scripts
+				Fixed installation bugs from 2.0.5
 				Kernel patch works for both 2.2.10 and 2.2.11 kernels.
 				There is no functional difference between the two packages         
 
 2.0.7   Aug 26, 1999		o  Merged X25API code into WANPIPE.
-				o  Fixed a memeory leak for X25API
+				o  Fixed a memory leak for X25API
 				o  Updated the X25API code for 2.2.X kernels.
 				o  Improved NEM handling.   
 
diff --git a/Documentation/networking/wavelan.txt b/Documentation/networking/wavelan.txt
index 82006e55d..c1acf5eb3 100644
--- a/Documentation/networking/wavelan.txt
+++ b/Documentation/networking/wavelan.txt
@@ -19,7 +19,7 @@ and many Linux driver to support it.
 
 	This is the driver for the ISA version of the first generation
 of the Wavelan, now discontinued. The device is 2 Mb/s, composed of a
-Intel 82586 controler and a Lucent Modem, and is NOT 802.11 compliant.
+Intel 82586 controller and a Lucent Modem, and is NOT 802.11 compliant.
 	The driver has been tested with the following hardware :
 	o Wavelan ISA 915 MHz (full length ISA card) 
 	o Wavelan ISA 915 MHz 2.0 (half length ISA card) 
@@ -38,7 +38,7 @@ Intel 82586 controler and a Lucent Modem, and is NOT 802.11 compliant.
 
 	This is the driver for the PCMCIA version of the first
 generation of the Wavelan, now discontinued. The device is 2 Mb/s,
-composed of a Intel 82593 controler (totally different from the 82586)
+composed of a Intel 82593 controller (totally different from the 82586)
 and a Lucent Modem, and NOT 802.11 compatible.
 	The driver has been tested with the following hardware :
 	o Wavelan Pcmcia 915 MHz 2.0 (Pcmcia card + separate