From 0ca0cd2571cfc7ed4e24660ee6cb24a7db505e5f Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 20 Apr 2008 13:44:26 +0000
Subject: [PATCH] Another round of typo fixes (mostly in messages).

---
 etc/MAKEDEV                               |  4 ++--
 games/battlestar/com1.c                   |  4 ++--
 games/battlestar/com5.c                   |  4 ++--
 games/hack/hack.do_wear.c                 |  4 ++--
 games/trek/events.c                       |  4 ++--
 libexec/dma/net.c                         |  4 ++--
 libexec/rbootd/parseconf.c                |  4 ++--
 sbin/atm/atm/atm_set.c                    |  4 ++--
 sbin/camcontrol/camcontrol.c              |  4 ++--
 sbin/disklabel/disklabel.c                |  4 ++--
 sbin/disklabel64/disklabel64.c            |  6 +++---
 sys/bus/firewire/fwohci.c                 |  4 ++--
 sys/bus/usb/ohci.c                        |  4 ++--
 sys/dev/disk/aic7xxx/aic7xxx.c            |  4 ++--
 sys/dev/disk/fd/fd.c                      |  4 ++--
 sys/dev/netif/re/if_re.c                  |  4 ++--
 sys/dev/sound/usb/uaudio.c                |  4 ++--
 sys/kern/subr_diskslice.c                 |  4 ++--
 sys/kern/uipc_socket2.c                   |  4 ++--
 sys/net/sppp/if_spppsubr.c                |  4 ++--
 sys/netbt/bt_proto.c                      |  4 ++--
 sys/netinet/ip_input.c                    |  4 ++--
 sys/netinet/sctp_input.c                  |  4 ++--
 sys/netinet/sctp_output.c                 | 10 +++++-----
 sys/netinet/sctp_usrreq.c                 |  4 ++--
 sys/netinet6/in6.c                        |  4 ++--
 sys/netproto/802_11/wlan/ieee80211_node.c |  4 ++--
 sys/platform/pc32/apic/mpapic.c           |  4 ++--
 usr.bin/systat/icmp6.c                    |  4 ++--
 usr.bin/xlint/lint1/err.c                 | 10 +++++-----
 usr.sbin/btconfig/btconfig.c              |  4 ++--
 usr.sbin/i4b/isdnd/rc_config.c            |  6 +++---
 usr.sbin/kgmon/kgmon.c                    | 10 +++++-----
 usr.sbin/mptable/mptable.c                |  4 ++--
 usr.sbin/mrouted/prune.c                  |  4 ++--
 35 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 32e160f9c3..d7b10e9423 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -21,7 +21,7 @@
 #
 #	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
 # $FreeBSD: src/etc/MAKEDEV,v 1.243.2.57 2003/02/10 11:35:53 simokawa Exp $
-# $DragonFly: src/etc/MAKEDEV,v 1.39 2008/02/17 19:51:53 swildner Exp $
+# $DragonFly: src/etc/MAKEDEV,v 1.40 2008/04/20 13:44:24 swildner Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, standard number of units (or close)
@@ -113,7 +113,7 @@
 #	pt*	Processor Type (HP scanner, as one example)
 #	pass*	CAM Passthrough device
 #	ses*	SES (SCSI Environmental Services) and
-#		SAF-TE (Scsi Accessable Fault-Tolerant Enclosures) device
+#		SAF-TE (SCSI Accessible Fault-Tolerant Enclosures) device
 #
 # PC-CARD (previously called PCMCIA) support
 #	card*	PC-CARD slots
diff --git a/games/battlestar/com1.c b/games/battlestar/com1.c
index 550c9a363b..b3d086e07a 100644
--- a/games/battlestar/com1.c
+++ b/games/battlestar/com1.c
@@ -32,7 +32,7 @@
  *
  * @(#)com1.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/games/battlestar/com1.c,v 1.7.2.1 2001/03/05 11:45:35 kris Exp $
- * $DragonFly: src/games/battlestar/com1.c,v 1.4 2006/08/08 16:47:20 pavalos Exp $
+ * $DragonFly: src/games/battlestar/com1.c,v 1.5 2008/04/20 13:44:24 swildner Exp $
  */
 
 #include "externs.h"
@@ -126,7 +126,7 @@ news(void)
 				puts("The dying sun sinks into the ocean, leaving a blood stained sunset.");
 				puts("The sky slowly fades from orange to violet to black.  A few stars");
 				puts("flicker on, and it is night.");
-				puts("The world seems completly different at night.");
+				puts("The world seems completely different at night.");
 			}
 		}
 		rythmn = gtime - gtime % CYCLE;
diff --git a/games/battlestar/com5.c b/games/battlestar/com5.c
index ebbd2c16c7..4e23fdd78c 100644
--- a/games/battlestar/com5.c
+++ b/games/battlestar/com5.c
@@ -32,7 +32,7 @@
  *
  * @(#)com5.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/games/battlestar/com5.c,v 1.9.2.1 2001/03/05 11:45:35 kris Exp $
- * $DragonFly: src/games/battlestar/com5.c,v 1.3 2006/08/08 16:47:20 pavalos Exp $
+ * $DragonFly: src/games/battlestar/com5.c,v 1.4 2008/04/20 13:44:24 swildner Exp $
  */
 
 #include "externs.h"
@@ -54,7 +54,7 @@ kiss(void)
 					puts("She is coming around; she didn't fight it as much.");
 					break;
 				case 2:
-					puts("She's begining to like it.");
+					puts("She's beginning to like it.");
 					break;
 				default:
 					puts("She's gone limp.");
diff --git a/games/hack/hack.do_wear.c b/games/hack/hack.do_wear.c
index beb9d67fc9..3d2a373b08 100644
--- a/games/hack/hack.do_wear.c
+++ b/games/hack/hack.do_wear.c
@@ -1,7 +1,7 @@
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* hack.do_wear.c - version 1.0.3 */
 /* $FreeBSD: src/games/hack/hack.do_wear.c,v 1.3 1999/11/16 02:57:03 billf Exp $ */
-/* $DragonFly: src/games/hack/hack.do_wear.c,v 1.5 2006/08/21 19:45:32 pavalos Exp $ */
+/* $DragonFly: src/games/hack/hack.do_wear.c,v 1.6 2008/04/20 13:44:24 swildner Exp $ */
 
 #include "hack.h"
 extern char quitchars[];
@@ -258,7 +258,7 @@ long mask;
 	mask = obj->owornmask & W_RING;
 	setworn((struct obj *) 0, obj->owornmask);
 	if(!(u.uprops[PROP(obj->otyp)].p_flgs & mask))
-		impossible("Strange... I didnt know you had that ring.");
+		impossible("Strange... I didn't know you had that ring.");
 	u.uprops[PROP(obj->otyp)].p_flgs &= ~mask;
 	switch(obj->otyp) {
 	case RIN_FIRE_RESISTANCE:
diff --git a/games/trek/events.c b/games/trek/events.c
index 7c31642c6f..e2396cf416 100644
--- a/games/trek/events.c
+++ b/games/trek/events.c
@@ -32,7 +32,7 @@
  *
  * @(#)events.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/games/trek/events.c,v 1.4 1999/11/30 03:49:47 billf Exp $
- * $DragonFly: src/games/trek/events.c,v 1.3 2006/09/07 21:19:44 pavalos Exp $
+ * $DragonFly: src/games/trek/events.c,v 1.4 2008/04/20 13:44:24 swildner Exp $
  */
 
 # include	"getpar.h"
@@ -224,7 +224,7 @@ events(int t_warp)
 			/* report it if we can */
 			if (!damaged(SSRADIO))
 			{
-				printf("\nUhura:  Captain, we have recieved a distress signal\n");
+				printf("\nUhura:  Captain, we have received a distress signal\n");
 				printf("  from the starbase in quadrant %d,%d.\n",
 					ix, iy);
 				restcancel++;
diff --git a/libexec/dma/net.c b/libexec/dma/net.c
index 1958d22c4d..111f333660 100644
--- a/libexec/dma/net.c
+++ b/libexec/dma/net.c
@@ -32,7 +32,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/libexec/dma/net.c,v 1.5 2008/03/04 11:36:09 matthias Exp $
+ * $DragonFly: src/libexec/dma/net.c,v 1.6 2008/04/20 13:44:24 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -291,7 +291,7 @@ deliver_remote(struct qitem *it, const char **errmsg)
 	if ((config->features & SECURETRANS) != 0) {
 		error = smtp_init_crypto(it, fd, config->features);
 		if (error >= 0)
-			syslog(LOG_INFO, "%s: SSL initialization sucessful",
+			syslog(LOG_INFO, "%s: SSL initialization successful",
 				it->queueid);
 		else
 			goto out;
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 5fd0502216..9534afc1ad 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -45,7 +45,7 @@
  *
  * @(#)parseconf.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/rbootd/parseconf.c,v 1.9.2.1 2001/03/05 11:17:52 kris Exp $
- * $DragonFly: src/libexec/rbootd/parseconf.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rbootd/parseconf.c,v 1.3 2008/04/20 13:44:24 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -141,7 +141,7 @@ ParseConfig()
 		 */
 		if ((addr = ParseAddr(bcp)) == NULL) {
 			syslog(LOG_ERR,
-			       "ParseConfig: line %d: cant parse <%s>",
+			       "ParseConfig: line %d: can't parse <%s>",
 			       linecnt, bcp);
 			continue;
 		}
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index 8a2c8e45f8..978f87b46f 100644
--- a/sbin/atm/atm/atm_set.c
+++ b/sbin/atm/atm/atm_set.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
- *	@(#) $DragonFly: src/sbin/atm/atm/atm_set.c,v 1.6 2006/10/16 00:15:35 pavalos Exp $
+ *	@(#) $DragonFly: src/sbin/atm/atm/atm_set.c,v 1.7 2008/04/20 13:44:24 swildner Exp $
  */
 
 /*
@@ -316,7 +316,7 @@ set_macaddr(int argc, char **argv, __unused const struct cmd *cmdp)
 			perror("Internal error");
 			break;
 		case EADDRINUSE:
-			fprintf(stderr, "Interface must be detached to set MAC addres\n");
+			fprintf(stderr, "Interface must be detached to set MAC address\n");
 			break;
 		case EINVAL:
 			fprintf(stderr, "Invalid parameter\n");
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 45c375fb87..e7514bba99 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.21.2.13 2003/01/08 17:55:02 njl Exp $
- * $DragonFly: src/sbin/camcontrol/camcontrol.c,v 1.12 2008/03/07 08:44:24 pavalos Exp $
+ * $DragonFly: src/sbin/camcontrol/camcontrol.c,v 1.13 2008/04/20 13:44:24 swildner Exp $
  */
 
 #include <sys/ioctl.h>
@@ -3739,7 +3739,7 @@ usage(int verbose)
 "defects arguments:\n"
 "-f format         specify defect list format (block, bfi or phys)\n"
 "-G                get the grown defect list\n"
-"-P                get the permanant defect list\n"
+"-P                get the permanent defect list\n"
 "inquiry arguments:\n"
 "-D                get the standard inquiry data\n"
 "-S                get the serial number\n"
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 358ff66b44..ea176a47c5 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -37,7 +37,7 @@
  * @(#)disklabel.c	1.2 (Symmetric) 11/28/85
  * @(#)disklabel.c      8.2 (Berkeley) 1/7/94
  * $FreeBSD: src/sbin/disklabel/disklabel.c,v 1.28.2.15 2003/01/24 16:18:16 des Exp $
- * $DragonFly: src/sbin/disklabel/disklabel.c,v 1.25 2007/08/08 20:15:50 swildner Exp $
+ * $DragonFly: src/sbin/disklabel/disklabel.c,v 1.26 2008/04/20 13:44:24 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -387,7 +387,7 @@ writelabel(int f, const char *boot, struct disklabel32 *lp)
 	int r;
 
 	if (disable_write) {
-		Warning("write to disk label supressed - label was as follows:");
+		Warning("write to disk label suppressed - label was as follows:");
 		display(stdout, lp);
 		return (0);
 	} else {
diff --git a/sbin/disklabel64/disklabel64.c b/sbin/disklabel64/disklabel64.c
index cecaeeb618..f3b15c7caf 100644
--- a/sbin/disklabel64/disklabel64.c
+++ b/sbin/disklabel64/disklabel64.c
@@ -31,7 +31,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sbin/disklabel64/disklabel64.c,v 1.4 2007/12/16 20:17:54 thomas Exp $
+ * $DragonFly: src/sbin/disklabel64/disklabel64.c,v 1.5 2008/04/20 13:44:25 swildner Exp $
  */
 /*
  * Copyright (c) 1987, 1993
@@ -71,7 +71,7 @@
  * @(#)disklabel.c	1.2 (Symmetric) 11/28/85
  * @(#)disklabel.c      8.2 (Berkeley) 1/7/94
  * $FreeBSD: src/sbin/disklabel/disklabel.c,v 1.28.2.15 2003/01/24 16:18:16 des Exp $
- * $DragonFly: src/sbin/disklabel64/disklabel64.c,v 1.4 2007/12/16 20:17:54 thomas Exp $
+ * $DragonFly: src/sbin/disklabel64/disklabel64.c,v 1.5 2008/04/20 13:44:25 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -405,7 +405,7 @@ writelabel(int f, struct disklabel64 *lp)
 	lpcrcsize = lpsize - offsetof(struct disklabel64, d_magic);
 
 	if (disable_write) {
-		Warning("write to disk label supressed - label was as follows:");
+		Warning("write to disk label suppressed - label was as follows:");
 		display(stdout, lp);
 		return (0);
 	} else {
diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c
index 7f15db008f..bb266f1e16 100644
--- a/sys/bus/firewire/fwohci.c
+++ b/sys/bus/firewire/fwohci.c
@@ -33,7 +33,7 @@
  * 
  * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.72 2004/01/22 14:41:17 simokawa Exp $
  * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.1.2.19 2003/05/01 06:24:37 simokawa Exp $
- * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.16 2008/01/06 16:55:49 swildner Exp $
+ * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.17 2008/04/20 13:44:25 swildner Exp $
  */
 
 #define ATRQ_CH 0
@@ -2183,7 +2183,7 @@ fwohci_rbuf_update(struct fwohci_softc *sc, int dmach)
 				ir->bnpacket, BUS_DMASYNC_POSTREAD);
 		} else {
 			/* XXX */
-			kprintf("fwohci_rbuf_update: this shouldn't happend\n");
+			kprintf("fwohci_rbuf_update: this shouldn't happen\n");
 		}
 
 		STAILQ_REMOVE_HEAD(&ir->stdma, link);
diff --git a/sys/bus/usb/ohci.c b/sys/bus/usb/ohci.c
index 4b7394f725..d3f91b5742 100644
--- a/sys/bus/usb/ohci.c
+++ b/sys/bus/usb/ohci.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ohci.c,v 1.138 2003/02/08 03:32:50 ichiro Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.154.2.4 2006/06/26 00:31:25 iedowse Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/ohci.c,v 1.24 2008/01/12 12:30:22 hasso Exp $	*/
+/*	$DragonFly: src/sys/bus/usb/ohci.c,v 1.25 2008/04/20 13:44:25 swildner Exp $	*/
 
 /* Also, already ported:
  *	$NetBSD: ohci.c,v 1.140 2003/05/13 04:42:00 gson Exp $
@@ -3272,7 +3272,7 @@ ohci_device_isoc_enter(usbd_xfer_handle xfer)
 		if (sitd == NULL) {
 			sitd = ohci_alloc_sitd(sc);
 			if (sitd == NULL)
-				panic("cant alloc isoc");
+				panic("can't alloc isoc");
 			opipe->tail.itd = sitd;
 			tdphys = sitd->physaddr;
 			sed->ed.ed_flags |= htole32(OHCI_ED_SKIP); /* Stop*/
diff --git a/sys/dev/disk/aic7xxx/aic7xxx.c b/sys/dev/disk/aic7xxx/aic7xxx.c
index 8a277b3055..02b6b7bc2f 100644
--- a/sys/dev/disk/aic7xxx/aic7xxx.c
+++ b/sys/dev/disk/aic7xxx/aic7xxx.c
@@ -40,7 +40,7 @@
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.111 2007/04/19 18:53:52 scottl Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.27 2008/02/09 18:13:13 pavalos Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.28 2008/04/20 13:44:25 swildner Exp $
  */
 
 #include "aic7xxx_osm.h"
@@ -921,7 +921,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		       scbptr, ahc_inb(ahc, ARG_1),
 		       ahc->scb_data->hscbs[scbptr].tag);
 		ahc_dump_card_state(ahc);
-		panic("for saftey");
+		panic("for safety");
 		break;
 	}
 	case OUT_OF_RANGE:
diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c
index a96e34d7f3..6f7b0ad370 100644
--- a/sys/dev/disk/fd/fd.c
+++ b/sys/dev/disk/fd/fd.c
@@ -51,7 +51,7 @@
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
  * $FreeBSD: src/sys/isa/fd.c,v 1.176.2.8 2002/05/15 21:56:14 joerg Exp $
- * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.41 2007/10/23 03:04:49 y0netan1 Exp $
+ * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.42 2008/04/20 13:44:25 swildner Exp $
  *
  */
 
@@ -780,7 +780,7 @@ fdc_attach(device_t dev)
 
 	error = fdc_alloc_resources(fdc);
 	if (error) {
-		device_printf(dev, "cannot re-aquire resources\n");
+		device_printf(dev, "cannot reacquire resources\n");
 		return error;
 	}
 	error = BUS_SETUP_INTR(device_get_parent(dev), dev, fdc->res_irq,
diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c
index ce6ad44cfe..3e5a477567 100644
--- a/sys/dev/netif/re/if_re.c
+++ b/sys/dev/netif/re/if_re.c
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $
- * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.38 2008/03/10 12:59:51 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.39 2008/04/20 13:44:25 swildner Exp $
  */
 
 /*
@@ -994,7 +994,7 @@ re_allocmem(device_t dev, struct re_softc *sc)
 	     RE_TX_LIST_SZ, re_dma_map_addr,
 	     &sc->re_ldata.re_tx_list_addr, BUS_DMA_NOWAIT);
 	if (error) {
-		device_printf(dev, "could not get addres of TX ring\n");
+		device_printf(dev, "could not get address of TX ring\n");
 		return(error);
 	}
 
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 82a88385da..191ca5e227 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $	*/
 /*	$FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.14.2.2 2006/04/04 17:34:10 ariff Exp $ */
-/*	$DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.19 2008/01/05 14:02:38 swildner Exp $: */
+/*	$DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.20 2008/04/20 13:44:25 swildner Exp $: */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -2611,7 +2611,7 @@ uaudio_query_formats(device_t dev, int reqdir, unsigned maxfmt, struct pcmchan_c
 		iscontinuous = asf1d->bSamFreqType == UA_SAMP_CONTNUOUS;
 
 		if (iscontinuous)
-			ksnprintf(freq_descr, sizeof(freq_descr), "continous min %d max %d", UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d));
+			ksnprintf(freq_descr, sizeof(freq_descr), "continuous min %d max %d", UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d));
 		else
 			ksnprintf(freq_descr, sizeof(freq_descr), "fixed frequency (%d listed formats)", asf1d->bSamFreqType);
 
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 364e1fad6d..9500b44667 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -44,7 +44,7 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  * $FreeBSD: src/sys/kern/subr_diskslice.c,v 1.82.2.6 2001/07/24 09:49:41 dd Exp $
- * $DragonFly: src/sys/kern/subr_diskslice.c,v 1.49 2007/07/23 19:53:34 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_diskslice.c,v 1.50 2008/04/20 13:44:25 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -213,7 +213,7 @@ doshift:
 		/*
 		 * Attempt to access partition when no disklabel present
 		 */
-		kprintf("dscheck(%s): attempt to access non-existant partition\n",
+		kprintf("dscheck(%s): attempt to access non-existent partition\n",
 			devtoname(dev));
 		goto bad;
 	}
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 0e758478c7..4d96f63544 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -33,7 +33,7 @@
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.55.2.17 2002/08/31 19:04:55 dwmalone Exp $
- * $DragonFly: src/sys/kern/uipc_socket2.c,v 1.29 2007/05/23 08:57:05 dillon Exp $
+ * $DragonFly: src/sys/kern/uipc_socket2.c,v 1.30 2008/04/20 13:44:25 swildner Exp $
  */
 
 #include "opt_param.h"
@@ -563,7 +563,7 @@ SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0, "");
 SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLTYPE_INT|CTLFLAG_RW, 
     &sb_max, 0, sysctl_handle_sb_max, "I", "Maximum socket buffer size");
 SYSCTL_INT(_kern_ipc, OID_AUTO, maxsockets, CTLFLAG_RD, 
-    &maxsockets, 0, "Maximum number of sockets avaliable");
+    &maxsockets, 0, "Maximum number of sockets available");
 SYSCTL_INT(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW,
     &sb_efficiency, 0, "");
 
diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c
index 6664996a09..bd7f18fe18 100644
--- a/sys/net/sppp/if_spppsubr.c
+++ b/sys/net/sppp/if_spppsubr.c
@@ -18,7 +18,7 @@
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
  * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.59.2.13 2002/07/03 15:44:41 joerg Exp $
- * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.32 2008/04/05 05:57:07 sephe Exp $
+ * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.33 2008/04/20 13:44:25 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -4313,7 +4313,7 @@ sppp_chap_tlu(struct sppp *sp)
 		if ((sp->hisauth.flags & AUTHFLAG_NORECHALLENGE) == 0)
 			log(-1, "next re-challenge in %d seconds\n", i);
 		else
-			log(-1, "re-challenging supressed\n");
+			log(-1, "re-challenging suppressed\n");
 	}
 
 	crit_enter();
diff --git a/sys/netbt/bt_proto.c b/sys/netbt/bt_proto.c
index 1ae6308cee..cfebb7cbef 100644
--- a/sys/netbt/bt_proto.c
+++ b/sys/netbt/bt_proto.c
@@ -1,4 +1,4 @@
-/* $DragonFly: src/sys/netbt/bt_proto.c,v 1.3 2008/03/18 13:41:42 hasso Exp $ */
+/* $DragonFly: src/sys/netbt/bt_proto.c,v 1.4 2008/04/20 13:44:25 swildner Exp $ */
 /* $OpenBSD: bt_proto.c,v 1.4 2007/06/24 20:55:27 uwe Exp $ */
 
 /*
@@ -200,7 +200,7 @@ SYSCTL_INT(_net_bluetooth_hci, OID_AUTO, scorxq_max, CTLFLAG_RW,
 
 /* L2CAP sysctls */
 SYSCTL_NODE(_net_bluetooth, OID_AUTO, l2cap, CTLFLAG_RD, 0,
-    "Logical Link Control & Adaption Protocol");
+    "Logical Link Control & Adaptation Protocol");
 SYSCTL_INT(_net_bluetooth_l2cap, OID_AUTO, sendspace, CTLFLAG_RW,
     &l2cap_sendspace, 0, "Socket Send Buffer Size");
 SYSCTL_INT(_net_bluetooth_l2cap, OID_AUTO, recvspace, CTLFLAG_RW,
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 84e81b061a..ba9a853f3e 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -65,7 +65,7 @@
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/netinet/ip_input.c,v 1.130.2.52 2003/03/07 07:01:28 silby Exp $
- * $DragonFly: src/sys/netinet/ip_input.c,v 1.78 2008/04/03 13:43:29 sephe Exp $
+ * $DragonFly: src/sys/netinet/ip_input.c,v 1.79 2008/04/20 13:44:25 swildner Exp $
  */
 
 #define	_IP_VHL
@@ -159,7 +159,7 @@ SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute,
 static int ip_keepfaith = 0;
 SYSCTL_INT(_net_inet_ip, IPCTL_KEEPFAITH, keepfaith, CTLFLAG_RW,
     &ip_keepfaith, 0,
-    "Enable packet capture for FAITH IPv4->IPv6 translater daemon");
+    "Enable packet capture for FAITH IPv4->IPv6 translator daemon");
 
 static int nipq = 0;	/* total # of reass queues */
 static int maxnipq;
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 0634aee2c1..551f745b99 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $	*/
-/*	$DragonFly: src/sys/netinet/sctp_input.c,v 1.12 2007/05/13 18:33:58 swildner Exp $	*/
+/*	$DragonFly: src/sys/netinet/sctp_input.c,v 1.13 2008/04/20 13:44:25 swildner Exp $	*/
 
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -1503,7 +1503,7 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
 			u_int8_t *pp;
 			pp = (u_int8_t *)initack_cp;
 			kprintf("process_cookie_new: could not find INIT-ACK chunk!\n");
-			kprintf("Found bytes %x %x %x %x at postion %d\n",
+			kprintf("Found bytes %x %x %x %x at position %d\n",
 			    (u_int)pp[0], (u_int)pp[1], (u_int)pp[2],
 			    (u_int)pp[3], initack_offset);
 		}
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index a89a9c1287..5acfd4bbe7 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $	*/
-/*	$DragonFly: src/sys/netinet/sctp_output.c,v 1.13 2008/03/07 11:34:20 sephe Exp $	*/
+/*	$DragonFly: src/sys/netinet/sctp_output.c,v 1.14 2008/04/20 13:44:25 swildner Exp $	*/
 
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -783,7 +783,7 @@ sctp_choose_v4_boundspecific_stcb(struct sctp_inpcb *inp,
 		 */
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) {
-			kprintf("Have a STCB - no asconf allowed, not bound all have a postive list\n");
+			kprintf("Have a STCB - no asconf allowed, not bound all have a positive list\n");
 		}
 #endif
 		/* First look at all addresses for one that is on
@@ -971,7 +971,7 @@ sctp_choose_v4_boundall(struct sctp_inpcb *inp,
 	num_prefered = sctp_count_v4_num_prefered_boundall (ifn, stcb, non_asoc_addr_ok, loopscope, ipv4_scope, &sin_loop, &sin_local);
 #ifdef SCTP_DEBUG
 	if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) {
-		kprintf("Found %d prefered source addresses\n", num_prefered);
+		kprintf("Found %d preferred source addresses\n", num_prefered);
 	}
 #endif
 	if (num_prefered == 0) {
@@ -1042,7 +1042,7 @@ sctp_choose_v4_boundall(struct sctp_inpcb *inp,
 								    loopscope, ipv4_scope, &sin_loop, &sin_local);
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) {
-			kprintf("Found ifn:%x %d prefered source addresses\n", (u_int)ifn, num_prefered);
+			kprintf("Found ifn:%x %d preferred source addresses\n", (u_int)ifn, num_prefered);
 		}
 #endif
 		if (num_prefered == 0) {
@@ -1444,7 +1444,7 @@ sctp_choose_v6_boundspecific_stcb(struct sctp_inpcb *inp,
 	} else {
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) {
-			kprintf("Have a STCB - no asconf allowed, not bound all have a postive list\n");
+			kprintf("Have a STCB - no asconf allowed, not bound all have a positive list\n");
 		}
 #endif
 		/* First try for interface output match */
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 5ddd3421e7..63b7516ac1 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_usrreq.c,v 1.47 2005/03/06 16:04:18 itojun Exp $	*/
-/*	$DragonFly: src/sys/netinet/sctp_usrreq.c,v 1.13 2008/03/07 11:34:20 sephe Exp $	*/
+/*	$DragonFly: src/sys/netinet/sctp_usrreq.c,v 1.14 2008/04/20 13:44:25 swildner Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -2320,7 +2320,7 @@ sctp_optsget(struct socket *so,
 			SCTP_INP_RLOCK(inp);
 #ifdef SCTP_DEBUG
 			if (sctp_debug_on & SCTP_DEBUG_USRREQ1) {
-				kprintf("In EP levle info\n");
+				kprintf("In EP level info\n");
 			}
 #endif /* SCTP_DEBUG */
 			paddrp->spp_pathmaxrxt = inp->sctp_ep.def_net_failure;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 7dff8c0ab3..c29085b845 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6.c,v 1.7.2.9 2002/04/28 05:40:26 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6.c,v 1.28 2008/03/07 11:34:21 sephe Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6.c,v 1.29 2008/04/20 13:44:26 swildner Exp $	*/
 /*	$KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $	*/
 
 /*
@@ -667,7 +667,7 @@ in6_control(struct socket *so, u_long cmd, caddr_t data,
 			if ((error = nd6_prelist_add(&pr0, NULL, &pr)) != 0)
 				return (error);
 			if (pr == NULL) {
-				log(LOG_ERR, "nd6_prelist_add succedded but "
+				log(LOG_ERR, "nd6_prelist_add succeeded but "
 				    "no prefix\n");
 				return (EINVAL); /* XXX panic here? */
 			}
diff --git a/sys/netproto/802_11/wlan/ieee80211_node.c b/sys/netproto/802_11/wlan/ieee80211_node.c
index ea78fed72e..89c22d7803 100644
--- a/sys/netproto/802_11/wlan/ieee80211_node.c
+++ b/sys/netproto/802_11/wlan/ieee80211_node.c
@@ -30,7 +30,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.48.2.12 2006/07/10 00:46:27 sam Exp $
- * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_node.c,v 1.17 2008/03/04 13:48:40 sephe Exp $
+ * $DragonFly: src/sys/netproto/802_11/wlan/ieee80211_node.c,v 1.18 2008/04/20 13:44:26 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -454,7 +454,7 @@ ieee80211_reset_bss(struct ieee80211com *ic)
 	ieee80211_node_table_reset(&ic->ic_sta);
 
 	ni = ieee80211_alloc_node(&ic->ic_scan, ic->ic_myaddr);
-	KASSERT(ni != NULL, ("unable to setup inital BSS node"));
+	KASSERT(ni != NULL, ("unable to setup initial BSS node"));
 	obss = ic->ic_bss;
 	ic->ic_bss = ieee80211_ref_node(ni);
 	if (obss != NULL) {
diff --git a/sys/platform/pc32/apic/mpapic.c b/sys/platform/pc32/apic/mpapic.c
index 31c6bf0d4c..ee97bc0439 100644
--- a/sys/platform/pc32/apic/mpapic.c
+++ b/sys/platform/pc32/apic/mpapic.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $
- * $DragonFly: src/sys/platform/pc32/apic/mpapic.c,v 1.21 2007/04/30 16:45:55 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/apic/mpapic.c,v 1.22 2008/04/20 13:44:26 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -692,7 +692,7 @@ acquire_apic_timer(void)
 	return 0;
 #else
 	/** XXX FIXME: make this really do something */
-	panic("APIC timer in use when attempting to aquire");
+	panic("APIC timer in use when attempting to acquire");
 #endif
 }
 
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index eb9f2d71ca..f4a01d9cc5 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -32,7 +32,7 @@
  *
  * @(#)mbufs.c     8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/systat/icmp6.c,v 1.3 2006/04/30 04:47:23 bde Exp $
- * $DragonFly: src/usr.bin/systat/icmp6.c,v 1.1 2007/05/31 11:38:36 hasso Exp $
+ * $DragonFly: src/usr.bin/systat/icmp6.c,v 1.2 2008/04/20 13:44:26 swildner Exp $
  */
 
 #include <sys/cdefs.h>
@@ -120,7 +120,7 @@ labelicmp6(void)
 	B(13, "time-to-live exceeded");
 	B(14, "parameter problem");
 	B(15, "neighbor solicitation");
-	B(16, "neighbor advertisment");
+	B(16, "neighbor advertisement");
 	L(17, "router advertisement");	R(17, "router solicitation");
 #undef L
 #undef R
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 5d8e65d5af..30070c8ded 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -31,7 +31,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $
- * $DragonFly: src/usr.bin/xlint/lint1/err.c,v 1.6 2004/07/07 12:13:26 asmodai Exp $
+ * $DragonFly: src/usr.bin/xlint/lint1/err.c,v 1.7 2008/04/20 13:44:26 swildner Exp $
  */
 
 /* number of errors found */
@@ -213,7 +213,7 @@ const	char *msgs[] = {
 	"assignment in conditional context",			      /* 159 */
 	"operator '==' found where '=' was expected",		      /* 160 */
 	"constant in conditional context",			      /* 161 */
-	"comparision of %s with %s, op %s",			      /* 162 */
+	"comparison of %s with %s, op %s",			      /* 162 */
 	"a cast does not yield an lvalue",			      /* 163 */
 	"assignment of negative constant to unsigned type",	      /* 164 */
 	"constant truncated by assignment",			      /* 165 */
@@ -281,7 +281,7 @@ const	char *msgs[] = {
 	"const object %s should have initializer",		      /* 227 */
 	"function cannot return const or volatile object",	      /* 228 */
 	"questionable conversion of function pointer",		      /* 229 */
-	"nonportable character comparision, op %s",		      /* 230 */
+	"nonportable character comparison, op %s",		      /* 230 */
 	"argument %s unused in function %s",			      /* 231 */
 	"label %s unused in function %s",			      /* 232 */
 	"struct %s never defined",				      /* 233 */
@@ -294,7 +294,7 @@ const	char *msgs[] = {
 	"assignment of different structures",			      /* 240 */
 	"dubious operation on enum, op %s",			      /* 241 */
 	"combination of '%s' and '%s', op %s",			      /* 242 */
-	"dubious comparision of enums, op %s",			      /* 243 */
+	"dubious comparison of enums, op %s",			      /* 243 */
 	"illegal structure pointer combination",		      /* 244 */
 	"illegal structure pointer combination, op %s",		      /* 245 */
 	"dubious conversion of enum to '%s'",			      /* 246 */
@@ -325,7 +325,7 @@ const	char *msgs[] = {
 	"switch expression must be of type `int' in traditional C",   /* 271 */
 	"empty translation unit",				      /* 272 */
 	"bit-field type '%s' invalid in ANSI C",		      /* 273 */
-	"ANSI C forbids comparision of %s with %s",		      /* 274 */
+	"ANSI C forbids comparison of %s with %s",		      /* 274 */
 	"cast discards 'const' from pointer target type",	      /* 275 */
 	"",							      /* 276 */
 	"initialisation of '%s' with '%s'",			      /* 277 */
diff --git a/usr.sbin/btconfig/btconfig.c b/usr.sbin/btconfig/btconfig.c
index 7e06ed3b0e..8dc4b645e9 100644
--- a/usr.sbin/btconfig/btconfig.c
+++ b/usr.sbin/btconfig/btconfig.c
@@ -1,5 +1,5 @@
 /* $NetBSD: btconfig.c,v 1.6 2007/09/07 18:40:01 plunky Exp $ */
-/* $DragonFly: src/usr.sbin/btconfig/btconfig.c,v 1.1 2008/01/04 09:54:22 hasso Exp $ */
+/* $DragonFly: src/usr.sbin/btconfig/btconfig.c,v 1.2 2008/04/20 13:44:26 swildner Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -726,7 +726,7 @@ print_stats(void)
 			err(EXIT_FAILURE, "SIOCZBTSTATS");
 	}
 
-	printf( "\tTotal bytes sent %d, recieved %d\n"
+	printf( "\tTotal bytes sent %d, received %d\n"
 		"\tCommands sent %d, Events received %d\n"
 		"\tACL data packets sent %d, received %d\n"
 		"\tSCO data packets sent %d, received %d\n"
diff --git a/usr.sbin/i4b/isdnd/rc_config.c b/usr.sbin/i4b/isdnd/rc_config.c
index 5e332f788b..8e12068c33 100644
--- a/usr.sbin/i4b/isdnd/rc_config.c
+++ b/usr.sbin/i4b/isdnd/rc_config.c
@@ -28,7 +28,7 @@
  *	-----------------------------------
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.6.2.3 2002/04/24 18:50:07 joerg Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.4 2007/05/13 22:25:42 swildner Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.5 2008/04/20 13:44:26 swildner Exp $
  *
  *      last edit-date: [Fri Jul 20 19:16:27 2001]
  *
@@ -1594,10 +1594,10 @@ print_config(void)
 				switch(cep->remote_numbers_handling)
 				{
 					case RNH_NEXT:
-						fprintf(PFILE, "next\t\t# use next number after last successfull for new dial\n");
+						fprintf(PFILE, "next\t\t# use next number after last successful for new dial\n");
 						break;
 					case RNH_LAST:
-						fprintf(PFILE, "last\t\t# use last successfull number for new dial\n");
+						fprintf(PFILE, "last\t\t# use last successful number for new dial\n");
 						break;
 					case RNH_FIRST:
 						fprintf(PFILE, "first\t\t# always start with first number for new dial\n");
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index c4b50d13cd..f3eb747145 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1992, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)kgmon.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.9 1999/08/28 01:16:42 peter Exp $
- * $DragonFly: src/usr.sbin/kgmon/kgmon.c,v 1.6 2004/12/22 01:28:39 joerg Exp $
+ * $DragonFly: src/usr.sbin/kgmon/kgmon.c,v 1.7 2008/04/20 13:44:26 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -225,13 +225,13 @@ kern_readonly(int mode)
 	if (pflag && (mode == GMON_PROF_HIRES || mode == GMON_PROF_ON))
 		fprintf(stderr, "data may be inconsistent\n");
 	if (rflag)
-		fprintf(stderr, "-r supressed\n");
+		fprintf(stderr, "-r suppressed\n");
 	if (Bflag)
-		fprintf(stderr, "-B supressed\n");
+		fprintf(stderr, "-B suppressed\n");
 	if (bflag)
-		fprintf(stderr, "-b supressed\n");
+		fprintf(stderr, "-b suppressed\n");
 	if (hflag)
-		fprintf(stderr, "-h supressed\n");
+		fprintf(stderr, "-h suppressed\n");
 	rflag = Bflag = bflag = hflag = 0;
 }
 
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 4cb04a7cff..57089cdbbe 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/mptable/mptable.c,v 1.12.2.3 2000/12/11 01:03:34 obrien Exp $
- * $DragonFly: src/usr.sbin/mptable/mptable.c,v 1.3 2005/04/05 09:04:49 joerg Exp $
+ * $DragonFly: src/usr.sbin/mptable/mptable.c,v 1.4 2008/04/20 13:44:26 swildner Exp $
  */
 
 /*
@@ -149,7 +149,7 @@ tableEntry basetableEntryTypes[] =
 tableEntry extendedtableEntryTypes[] =
 {
     { 128, 20, "System Address Space" },
-    { 129,  8, "Bus Heirarchy" },
+    { 129,  8, "Bus Hierarchy" },
     { 130,  8, "Compatibility Bus Address" }
 };
 
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index a09d058554..a7bd73c423 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -10,7 +10,7 @@
  * prune.c,v 3.8.4.59 1998/03/01 02:06:32 fenner Exp
  *
  * $FreeBSD: src/usr.sbin/mrouted/prune.c,v 1.17.2.1 2000/10/29 03:59:57 kris Exp $
- * $DragonFly: src/usr.sbin/mrouted/prune.c,v 1.5 2005/12/05 00:58:50 swildner Exp $
+ * $DragonFly: src/usr.sbin/mrouted/prune.c,v 1.6 2008/04/20 13:44:26 swildner Exp $
  */
 
 #include "defs.h"
@@ -2272,7 +2272,7 @@ accept_mtrace(u_int32 src, u_int32 dst, u_int32 group, char *data,
     }
     else {
 	log(LOG_WARNING, 0, "%s from %s to %s",
-	    "Non decipherable traceroute request recieved",
+	    "Non decipherable traceroute request received",
 	    inet_fmt(src, s1), inet_fmt(dst, s2));
 	return;
     }
-- 
2.41.0