Merge with Linux 2.2.8.

6 files changed, 20 insertions, 20 deletions

diff --git a/Documentation/networking/filter.txt b/Documentation/networking/filter.txt
index be865f352..86fc021af 100644
--- a/Documentation/networking/filter.txt
+++ b/Documentation/networking/filter.txt
@@ -12,7 +12,7 @@ Linux Socket Filtering (LSF) allows a user-space program to
 attach a filter onto any socket and allow or disallow certain
 types of data to come through the socket. LSF follows exactly
 the same filter code structure as the BSD Berkeley Packet Filter
-(BPF), so refering to the BSD bpf.4 manpage is very helpful in
+(BPF), so referring to the BSD bpf.4 manpage is very helpful in
 creating filters.
 
 LSF is much simpler than BPF. One does not have to worry about
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index bf89a87dc..20d319029 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -96,7 +96,7 @@ tcp_timestamps - BOOLEAN
 	Enable timestamps as defined in RFC1323.
 
 tcp_sack - BOOLEAN
-	Enable select acknowledgements.
+	Enable select acknowledgments.
 
 tcp_retrans_collapse - BOOLEAN
 	Bug-to-bug compatibility with some broken printers.
@@ -119,7 +119,7 @@ icmp_destunreach_rate - INTEGER
 icmp_paramprob_rate - INTEGER
 icmp_timeexceed_rate - INTEGER
 icmp_echoreply_rate - INTEGER (not enabled per default)
-	Limit the maximal rates for sending ICMP packets to specifc targets.
+	Limit the maximal rates for sending ICMP packets to specific targets.
 	0 to disable any limiting, otherwise the maximal rate in jiffies(1)
 	See the source for more information.
 
@@ -173,7 +173,7 @@ redirects - BOOLEAN
 bootp_relay - BOOLEAN
 	Accept packets with source address 0.b.c.d destined
 	not to this host as local ones. It is supposed, that
-	BOOTP relay deamon will catch and forward such packets.
+	BOOTP relay daemon will catch and forward such packets.
 
 	default FALSE
 	Not Implemented Yet.
diff --git a/Documentation/networking/ipddp.txt b/Documentation/networking/ipddp.txt
index f49b16909..c2cabb682 100644
--- a/Documentation/networking/ipddp.txt
+++ b/Documentation/networking/ipddp.txt
@@ -14,7 +14,7 @@ Through this driver you can either allow your Linux box to communicate
 IP over an AppleTalk network or you can provide IP gatewaying functions
 for your AppleTalk users.
 
-You can currently Encapsulate or Decapsulate AppleTalk-IP on LocalTalk,
+You can currently encapsulate or decapsulate AppleTalk-IP on LocalTalk,
 EtherTalk and PPPTalk. The only limit on the protocol is that of what
 kernel AppleTalk layer and drivers are available.
 
@@ -23,22 +23,22 @@ Each mode requires its own user space software.
 Compiling AppleTalk-IP Decapsulation/Encapsulation
 =================================================
 
-AppleTalk-IP Decapsulation needs to be compiled into your kernel. You
-will need to turn on Appletalk-IP driver support. Then you will need to
-select ONE of the two options; IP to AppleTalk-IP Encapsulation support or
-AppleTalk-IP to IP Decapsulation support. If you compile the driver
+AppleTalk-IP decapsulation needs to be compiled into your kernel. You
+will need to turn on AppleTalk-IP driver support. Then you will need to
+select ONE of the two options; IP to AppleTalk-IP encapsulation support or
+AppleTalk-IP to IP decapsulation support. If you compile the driver
 statically you will only be able to use the driver for the function you have
 enabled in the kernel. If you compile the driver as a module you can
 select what mode you want it to run in via a module loading param.
-ipddp_mode=1 for AppleTalk-IP Encapsulation and ipddp_mode=2 for
-AppleTalk-IP to IP Decapsulation.
+ipddp_mode=1 for AppleTalk-IP encapsulation and ipddp_mode=2 for
+AppleTalk-IP to IP decapsulation.
 
 Basic instructions for user space tools
 =======================================
 
-To enable AppleTalk-IP Decapsulation/Encapsulation you will need the 
-proper tools. You can get the tools for Decapsulation from
-http://spacs1.spacs.k12.wi.us/~jschlst/MacGate and for Encapsulation
+To enable AppleTalk-IP decapsulation/encapsulation you will need the 
+proper tools. You can get the tools for decapsulation from
+http://spacs1.spacs.k12.wi.us/~jschlst/MacGate and for encapsulation
 from http://www.maths.unm.edu/~bradford/ltpc.html
 
 I will briefly describe the operation of the tools, but you will
@@ -61,8 +61,8 @@ traffic out the ipddp interface.
 
 Common Uses of ipddp.c
 ----------------------
-Of course AppleTalk-IP Decapsulation and Encapsulation, but specificly
-Decapsulation is being used most for connecting LocalTalk networks to
+Of course AppleTalk-IP decapsulation and encapsulation, but specifically
+decapsulation is being used most for connecting LocalTalk networks to
 IP networks. Although it has been used on EtherTalk networks to allow
 Macs that are only able to tunnel IP over EtherTalk.
 
@@ -73,6 +73,6 @@ EtherTalk only network.
 Further Assistance
 -------------------
 You can contact me (Jay Schulist <Jay.Schulist@spacs.k12.wi.us>) with any
-questions reguarding Decapsulation or Encapsulation. Bradford W. Johnson
+questions regarding decapsulation or encapsulation. Bradford W. Johnson
 <johns393@maroon.tc.umn.edu> originally wrote the ipddp.c driver for IP
 encapsulation in AppleTalk.
diff --git a/Documentation/networking/lapb-module.txt b/Documentation/networking/lapb-module.txt
index 30c73f09f..28a000838 100644
--- a/Documentation/networking/lapb-module.txt
+++ b/Documentation/networking/lapb-module.txt
@@ -216,7 +216,7 @@ void (*disconnect_confirmation)(void *token, int reason);
 
 This is called by the LAPB module when an event occurs after the device
 driver has called lapb_disconnect_request (see above). The reason indicates
-what has happended. In all cases the LAPB link can be regarded as being
+what has happened. In all cases the LAPB link can be regarded as being
 terminated. The values for reason are:
 
 LAPB_OK			The LAPB link was terminated normally.
diff --git a/Documentation/networking/pt.txt b/Documentation/networking/pt.txt
index cae844d3f..72e888c1d 100644
--- a/Documentation/networking/pt.txt
+++ b/Documentation/networking/pt.txt
@@ -2,7 +2,7 @@ This is the README for the Gracilis Packetwin device driver, version 0.5
 ALPHA for Linux 1.3.43.
 
 These files will allow you to talk to the PackeTwin (now know as PT) and
-connect through it just like a pair of TNC's.  To do this you will also
+connect through it just like a pair of TNCs.  To do this you will also
 require the AX.25 code in the kernel enabled.
 
 There are four files in this archive; this readme, a patch file, a .c file
diff --git a/Documentation/networking/routing.txt b/Documentation/networking/routing.txt
index f9a6ad378..a26838b93 100644
--- a/Documentation/networking/routing.txt
+++ b/Documentation/networking/routing.txt
@@ -1,6 +1,6 @@
 The directory ftp.inr.ac.ru:/ip-routing contains:
 
-- iproute.c - "professional" routing table maintainance utility.
+- iproute.c - "professional" routing table maintenance utility.
 
 - rdisc.tar.gz - rdisc daemon, ported from Sun.
 	STRONGLY RECOMMENDED FOR ALL HOSTS.