fix some typos

ok henning otto

8 files changed, 22 insertions, 22 deletions

diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index 7f78c51df36..8f367fdae44 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.103 2004/07/05 16:54:53 henning Exp $ */
+/*	$OpenBSD: kroute.c,v 1.104 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -997,7 +997,7 @@ if_change(u_short ifindex, int flags, struct if_data *ifd)
 	LIST_FOREACH(kkr, &kif->kroute_l, entry) {
 		/*
 		 * we treat link_state == LINK_STATE_UNKNOWN as valid
-		 * not all interfaces have a conecpt of "link state" and/or
+		 * not all interfaces have a concept of "link state" and/or
 		 * do not report up
 		 */
 		if (reachable)
diff --git a/usr.sbin/bgpd/mrt.h b/usr.sbin/bgpd/mrt.h
index 19c457f0edf..ab3d366da6f 100644
--- a/usr.sbin/bgpd/mrt.h
+++ b/usr.sbin/bgpd/mrt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mrt.h,v 1.11 2004/07/03 17:19:59 claudio Exp $ */
+/*	$OpenBSD: mrt.h,v 1.12 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -201,7 +201,7 @@ enum MRT_BGP_TYPES {
  * +--------+--------+--------+--------+
  *
  * For IPv6 the type is MSG_PROTOCOL_BGP4PLUS and the subtype remains
- * MSG_BGP_UPDATE. The sourec_ip and dest_ip are again extended to 16 bytes.
+ * MSG_BGP_UPDATE. The source_ip and dest_ip are again extended to 16 bytes.
  */
 
 /*
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index f64bd1083f8..e604dca6087 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.118 2004/07/05 16:54:53 henning Exp $ */
+/*	$OpenBSD: parse.y,v 1.119 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -968,7 +968,7 @@ filter_set_opt	: LOCALPREF number		{
 			}
 			free($2);
 			if ($$.community.as <= 0 || $$.community.as > 0xffff) {
-				yyerror("Invalid comminity");
+				yyerror("Invalid community");
 				YYERROR;
 			}
 			/* Don't allow setting of unknown well-known types */
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 9669aff4141..17653f5d49f 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.126 2004/07/05 16:54:53 henning Exp $ */
+/*	$OpenBSD: rde.c,v 1.127 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -675,7 +675,7 @@ rde_update_dispatch(struct imsg *imsg)
 		nlri_len -= pos;
 
 		/*
-		 * We need to copy attrs befor calling the filter because
+		 * We need to copy attrs before calling the filter because
 		 * the filter may change the attributes.
 		 */
 		attr_copy(&fattrs, &attrs);
@@ -915,7 +915,7 @@ rde_reflector(struct rde_peer *peer, struct attr_flags *attrs)
 	/* check for originator id if eq router_id drop */
 	if ((a = attr_optget(attrs, ATTR_ORIGINATOR_ID)) != NULL) {
 		if (memcmp(&conf->bgpid, a->data, sizeof(conf->bgpid)) == 0)
-			/* this is comming from myself */
+			/* this is coming from myself */
 			return (0);
 	} else if ((conf->flags & BGPD_FLAG_REFLECTOR) &&
 	    attr_optadd(attrs, ATTR_OPTIONAL, ATTR_ORIGINATOR_ID,
@@ -928,7 +928,7 @@ rde_reflector(struct rde_peer *peer, struct attr_flags *attrs)
 		if ((a = attr_optget(attrs, ATTR_CLUSTER_LIST)) != NULL) {
 			for (len = 0; len < a->len;
 			    len += sizeof(conf->clusterid))
-				/* check if comming from my cluster */
+				/* check if coming from my cluster */
 				if (memcmp(&conf->clusterid, a->data + len,
 				    sizeof(conf->clusterid)) == 0)
 					return (0);
@@ -1543,7 +1543,7 @@ rde_shutdown(void)
 	u_int32_t		 i;
 
 	/*
-	 * the decision process is turend of if rde_quit = 1 and
+	 * the decision process is turned off if rde_quit = 1 and
 	 * rde_shutdown depends on this.
 	 */
 
diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index 4061a42ab74..e54166bf188 100644
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.h,v 1.44 2004/07/05 16:54:53 henning Exp $ */
+/*	$OpenBSD: rde.h,v 1.45 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -31,7 +31,7 @@ enum peer_state {
 	PEER_NONE,
 	PEER_DOWN,
 	PEER_UP,
-	PEER_ERR	/* error occured going to PEER_DOWN state */
+	PEER_ERR	/* error occurred going to PEER_DOWN state */
 };
 
 /*
diff --git a/usr.sbin/bgpd/rde_attr.c b/usr.sbin/bgpd/rde_attr.c
index 29962edf8a4..d20d072f5f4 100644
--- a/usr.sbin/bgpd/rde_attr.c
+++ b/usr.sbin/bgpd/rde_attr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_attr.c,v 1.37 2004/07/05 17:27:32 claudio Exp $ */
+/*	$OpenBSD: rde_attr.c,v 1.38 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -869,8 +869,8 @@ aspath_neighbor(struct aspath *aspath)
 {
 	/*
 	 * Empty aspath is OK -- internal as route.
-	 * But what is the neighbor? For now let's return 0 that
-	 * should not break anything.
+	 * But what is the neighbor? For now let's return 0.
+	 * That should not break anything.
 	 */
 
 	if (aspath->hdr.len == 0)
diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c
index f730b89952a..5a712d28498 100644
--- a/usr.sbin/bgpd/rde_update.c
+++ b/usr.sbin/bgpd/rde_update.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_update.c,v 1.22 2004/07/05 02:13:44 henning Exp $ */
+/*	$OpenBSD: rde_update.c,v 1.23 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -262,7 +262,7 @@ up_generate_updates(struct rde_peer *peer,
 		if (old->aspath->peer->conf.ebgp == 0 && peer->conf.ebgp == 0) {
 			/*
 			 * redistribution rules:
-			 * 1. if annouce is set			-> announce
+			 * 1. if announce is set		-> announce
 			 * 2. old non-client, new non-client	-> no 
 			 * 3. old client, new non-client	-> yes
 			 * 4. old non-client, new client	-> yes
@@ -357,7 +357,7 @@ up_generate_updates(struct rde_peer *peer,
 		if (new->aspath->peer->conf.ebgp == 0 && peer->conf.ebgp == 0) {
 			/*
 			 * redistribution rules:
-			 * 1. if annouce is set			-> announce
+			 * 1. if announce is set		-> announce
 			 * 2. old non-client, new non-client	-> no 
 			 * 3. old client, new non-client	-> yes
 			 * 4. old non-client, new client	-> yes
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 83b8b7c28a3..5988b9c0db8 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.182 2004/07/04 03:51:31 henning Exp $ */
+/*	$OpenBSD: session.c,v 1.183 2004/07/13 17:57:20 jaredy Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1867,7 +1867,7 @@ parse_notification(struct peer *peer)
 		if (datalen == 0) {	/* zebra likes to send those.. humbug */
 			log_peer_warnx(&peer->conf, "received \"unsupported "
 			    "capability\" notification without data part, "
-			    "disabling capability announcements alltogether");
+			    "disabling capability announcements altogether");
 			peer->capa.announce = 0;
 		}
 
@@ -1907,7 +1907,7 @@ parse_notification(struct peer *peer)
 				log_peer_warnx(&peer->conf, "received "
 				    "\"unsupported capability\" notification "
 				    "for unknown capability %u, disabling "
-				    "capability announcements alltogether",
+				    "capability announcements altogether",
 				    capa_code);
 				peer->capa.announce = 0;
 				break;