Merge branch 'master' into xkb

Conflicts:
	config.make.in
	configure.in

8 files changed, 13 insertions, 13 deletions

diff --git a/pfinet/linux-src/net/ipv6/addrconf.c b/pfinet/linux-src/net/ipv6/addrconf.c
index e3ca6d72..d392b3fd 100644
--- a/pfinet/linux-src/net/ipv6/addrconf.c
+++ b/pfinet/linux-src/net/ipv6/addrconf.c
@@ -373,9 +373,9 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
 }
 
 /*
- *	Choose an apropriate source address
+ *	Choose an appropriate source address
  *	should do:
- *	i)	get an address with an apropriate scope
+ *	i)	get an address with an appropriate scope
  *	ii)	see if there is a specific route for the destination and use
  *		an address of the attached interface 
  *	iii)	don't use deprecated addresses
diff --git a/pfinet/linux-src/net/ipv6/af_inet6.c b/pfinet/linux-src/net/ipv6/af_inet6.c
index fb5d3957..ca428188 100644
--- a/pfinet/linux-src/net/ipv6/af_inet6.c
+++ b/pfinet/linux-src/net/ipv6/af_inet6.c
@@ -551,7 +551,7 @@ __initfunc(void inet6_proto_init(struct net_proto *pro))
 	/*
 	 *	ipngwg API draft makes clear that the correct semantics
 	 *	for TCP and UDP is to consider one TCP and UDP instance
-	 *	in a host availiable by both INET and INET6 APIs and
+	 *	in a host available by both INET and INET6 APIs and
 	 *	able to communicate via both network protocols.
 	 */
 
diff --git a/pfinet/linux-src/net/ipv6/icmpv6.c b/pfinet/linux-src/net/ipv6/icmpv6.c
index f7bebe0a..9d701764 100644
--- a/pfinet/linux-src/net/ipv6/icmpv6.c
+++ b/pfinet/linux-src/net/ipv6/icmpv6.c
@@ -567,15 +567,15 @@ int icmpv6_rcv(struct sk_buff *skb, unsigned long len)
 
 	default:
 		if (net_ratelimit())
-			printk(KERN_DEBUG "icmpv6: msg of unkown type\n");
+			printk(KERN_DEBUG "icmpv6: msg of unknown type\n");
 		
 		/* informational */
 		if (type & 0x80)
 			break;
 
-		/* 
-		 * error of unkown type. 
-		 * must pass to upper level 
+		/*
+		 * error of unknown type.
+		 * must pass to upper level
 		 */
 
 		icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu,
diff --git a/pfinet/linux-src/net/ipv6/ip6_fib.c b/pfinet/linux-src/net/ipv6/ip6_fib.c
index d1908348..9468c023 100644
--- a/pfinet/linux-src/net/ipv6/ip6_fib.c
+++ b/pfinet/linux-src/net/ipv6/ip6_fib.c
@@ -234,7 +234,7 @@ static __inline__ void rt6_release(struct rt6_info *rt)
 /*
  *	Routing Table
  *
- *	return the apropriate node for a routing tree "add" operation
+ *	return the appropriate node for a routing tree "add" operation
  *	by either creating and inserting or by returning an existing
  *	node.
  */
diff --git a/pfinet/linux-src/net/ipv6/ip6_input.c b/pfinet/linux-src/net/ipv6/ip6_input.c
index 54a3f455..c4a51831 100644
--- a/pfinet/linux-src/net/ipv6/ip6_input.c
+++ b/pfinet/linux-src/net/ipv6/ip6_input.c
@@ -246,7 +246,7 @@ int ip6_mc_input(struct sk_buff *skb)
 		deliver = 1;
 
 	/*
-	 *	IPv6 multicast router mode isnt currently supported.
+	 *	IPv6 multicast router mode isn't currently supported.
 	 */
 #if 0
 	if (ipv6_config.multicast_route) {
diff --git a/pfinet/linux-src/net/ipv6/ip6_output.c b/pfinet/linux-src/net/ipv6/ip6_output.c
index f67e3e9e..e06ad59a 100644
--- a/pfinet/linux-src/net/ipv6/ip6_output.c
+++ b/pfinet/linux-src/net/ipv6/ip6_output.c
@@ -481,7 +481,7 @@ int ip6_build_xmit(struct sock *sk, inet_getfrag_t getfrag, const void *data,
 		if (err) {
 #if IP6_DEBUG >= 2
 			printk(KERN_DEBUG "ip6_build_xmit: "
-			       "no availiable source address\n");
+			       "no available source address\n");
 #endif
 			goto out;
 		}
diff --git a/pfinet/linux-src/net/ipv6/ndisc.c b/pfinet/linux-src/net/ipv6/ndisc.c
index 3b3d3f4e..61f950d2 100644
--- a/pfinet/linux-src/net/ipv6/ndisc.c
+++ b/pfinet/linux-src/net/ipv6/ndisc.c
@@ -554,7 +554,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
 
 	if (skb->nh.ipv6h->hop_limit != 255) {
 		printk(KERN_INFO
-		       "NDISC: fake router advertisment received\n");
+		       "NDISC: fake router advertisement received\n");
 		return;
 	}
 
@@ -694,7 +694,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
 			ND_PRINTK0("got illegal option with RA");
 			break;
 		default:
-			ND_PRINTK0("unkown option in RA\n");
+			ND_PRINTK0("unknown option in RA\n");
                 };
                 optlen -= len;
                 opt += len;
diff --git a/pfinet/linux-src/net/ipv6/udp_ipv6.c b/pfinet/linux-src/net/ipv6/udp_ipv6.c
index 1886e8ac..f6968ae4 100644
--- a/pfinet/linux-src/net/ipv6/udp_ipv6.c
+++ b/pfinet/linux-src/net/ipv6/udp_ipv6.c
@@ -335,7 +335,7 @@ ipv4_connected:
 
 	ip6_dst_store(sk, dst, fl.fl6_dst);
 
-	/* get the source adddress used in the apropriate device */
+	/* get the source adddress used in the appropriate device */
 
 	err = ipv6_get_saddr(dst, daddr, &saddr);