NetBSD-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kern/54889: Big diff for various typos in the code



>Number:         54889
>Category:       kern
>Synopsis:       Big diff for various typos in the code
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 24 06:35:00 +0000 2020
>Originator:     Andrius V
>Release:        current
>Organization:
>Environment:
>Description:
Hello,

I prepared a big diff to fix various typos in the comments, printing and few definitions. In general, I ignored typos in "external" (except two exceptions which seemed like NetBSD specific still). Provided it initially in the netbsd-code IRC channel but was suggested to send a PR instead. Also available in https://pastebin.com/PdcxMMMP (for a week).

Regards,
Andrius V
>How-To-Repeat:
Search for common typos in the code.
>Fix:
diff --git a/bin/ksh/tty.c b/bin/ksh/tty.c
index d106b3e0f9f..c7d447de50e 100644
--- a/bin/ksh/tty.c
+++ b/bin/ksh/tty.c
@@ -92,7 +92,7 @@ set_tty(fd, ts, flags)
 }
 
 
-/* Initialize tty_fd.  Used for saving/reseting tty modes upon
+/* Initialize tty_fd.  Used for saving/resetting tty modes upon
  * foreground job completion and for setting up tty process group.
  */
 void
diff --git a/common/dist/zlib/zlib.h b/common/dist/zlib/zlib.h
index da4faedac26..0166ef5a121 100644
--- a/common/dist/zlib/zlib.h
+++ b/common/dist/zlib/zlib.h
@@ -278,7 +278,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
   buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
+  which can be used if desired to determine whether or not there is more output
   in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
@@ -1441,7 +1441,7 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
    provided, but could be inferred from the result of gztell().  This behavior
    is the same as the behavior of fread() implementations in common libraries,
    but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
+   file, resetting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
diff --git a/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c b/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
index cc3b374dd57..b41730f4262 100644
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
@@ -1997,7 +1997,7 @@ isakmp_cfg_setenv(iph1, envp, envc)
 		return -1;
 	}
 
-	/* Deault domain */
+	/* Default domain */
 	if(iph1->mode_cfg->flags & ISAKMP_CFG_GOT_DEFAULT_DOMAIN) 
 		strncpy(defdom, 
 		    iph1->mode_cfg->default_domain, 
diff --git a/crypto/external/bsd/libsaslc/dist/src/error.h b/crypto/external/bsd/libsaslc/dist/src/error.h
index a92b974be48..aa2c3106080 100644
--- a/crypto/external/bsd/libsaslc/dist/src/error.h
+++ b/crypto/external/bsd/libsaslc/dist/src/error.h
@@ -68,7 +68,7 @@ do {					\
 } while(/*CONSTCOND*/0);
 
 /*
- * saslc__eror_get_errno - gets error type
+ * saslc__error_get_errno - gets error type
  *
  * E - error
  */
diff --git a/dist/pf/sbin/pfctl/pfctl_altq.c b/dist/pf/sbin/pfctl/pfctl_altq.c
index cac57ce3055..5304a5d5d35 100644
--- a/dist/pf/sbin/pfctl/pfctl_altq.c
+++ b/dist/pf/sbin/pfctl/pfctl_altq.c
@@ -1062,7 +1062,7 @@ char *
 rate2str(double rate)
 {
 	char		*buf;
-	static char	 r2sbuf[R2S_BUFS][RATESTR_MAX];  /* ring bufer */
+	static char	 r2sbuf[R2S_BUFS][RATESTR_MAX];  /* ring buffer */
 	static int	 idx = 0;
 	int		 i;
 	static const char unit[] = " KMG";
diff --git a/external/mit/lua/dist/lua2netbsd b/external/mit/lua/dist/lua2netbsd
index 95cc088dc29..1e6b78f73b8 100755
--- a/external/mit/lua/dist/lua2netbsd
+++ b/external/mit/lua/dist/lua2netbsd
@@ -28,7 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# lua2netbsd:  prepare a Lua source tree for NeBSD.
+# lua2netbsd:  prepare a Lua source tree for NetBSD.
 
 ### Remove the $'s around various RCSIDs
 cleantags src doc
diff --git a/lib/libpthread/pthread.c b/lib/libpthread/pthread.c
index a575e5db9a0..1c11c704ba2 100644
--- a/lib/libpthread/pthread.c
+++ b/lib/libpthread/pthread.c
@@ -175,7 +175,7 @@ pthread__init(void)
 
 	/*
 	 * Allocate pthread_keys descriptors before
-	 * reseting __uselibcstub because otherwise 
+	 * resetting __uselibcstub because otherwise 
 	 * malloc() will call pthread_keys_create()
 	 * while pthread_keys descriptors are not 
 	 * yet allocated.
diff --git a/lib/libterminfo/term.h b/lib/libterminfo/term.h
index fd80bdb39ac..a66cdf86676 100644
--- a/lib/libterminfo/term.h
+++ b/lib/libterminfo/term.h
@@ -313,7 +313,7 @@ enum TINUMS {
  * dot_vert_spacing: Spacing of pins vertically in pins per inch
  * init_tabs: Tabs initially every #1 spaces
  * label_height: Number of rows in each label
- * label_width: Numbre of columns in each label
+ * label_width: Number of columns in each label
  * lines: Number of lines on a screen or a page
  * lines_of_memory: Lines of memory of > lines; 0 means varies
  * max_attributes: Maximum combined video attributes terminal can display
diff --git a/sbin/mount_portal/examples/rfilter.2 b/sbin/mount_portal/examples/rfilter.2
index f3386755cf8..b2c28ccd32a 100644
--- a/sbin/mount_portal/examples/rfilter.2
+++ b/sbin/mount_portal/examples/rfilter.2
@@ -79,7 +79,7 @@ a file from ftp://...:
 
 The problem is, when tar sees a file of the form A:B, it assumes
 A is a hostname.  In this case, A is "portal/ftp", which is
-obviosly not a hostname.
+obviously not a hostname.
 
 If we want to avoid this problem, there are at least two
 solutions:
diff --git a/sbin/newfs_udf/newfs_udf.c b/sbin/newfs_udf/newfs_udf.c
index 3e6003b79d5..be86fafd594 100644
--- a/sbin/newfs_udf/newfs_udf.c
+++ b/sbin/newfs_udf/newfs_udf.c
@@ -760,7 +760,7 @@ main(int argc, char **argv)
 			emul_packetsize = MIN(emul_packetsize, 32);
 			break;
 		case 't' :
-			/* time zone overide */
+			/* time zone override */
 			context.gmtoff = a_num(optarg, "gmtoff");
 			break;
 		default  :
diff --git a/sys/arch/acorn32/podulebus/esc.c b/sys/arch/acorn32/podulebus/esc.c
index 4ae759bf687..ba3b049bf8b 100644
--- a/sys/arch/acorn32/podulebus/esc.c
+++ b/sys/arch/acorn32/podulebus/esc.c
@@ -1102,7 +1102,7 @@ esc_midaction(struct esc_softc *dev, esc_regmap_p rp, struct nexus *nexus)
 
 		case ESC_NS_RESET:
 			/*
-			 * We were reseting this SCSI-unit. Clean up the
+			 * We were resetting this SCSI-unit. Clean up the
 			 * nexus struct.
 			 */
 			dev->sc_led(dev, 0);
diff --git a/sys/arch/acorn32/podulebus/escvar.h b/sys/arch/acorn32/podulebus/escvar.h
index 85397535c37..43d74855920 100644
--- a/sys/arch/acorn32/podulebus/escvar.h
+++ b/sys/arch/acorn32/podulebus/escvar.h
@@ -130,7 +130,7 @@ struct nexus {
 #define ESC_NS_RESELECTED	10	/* We was reselected */
 #define ESC_NS_DONE		11	/* Done. Prephsase to FINISHED */
 #define ESC_NS_FINISHED		12	/* Realy done. Call scsi_done */
-#define ESC_NS_RESET		13	/* We are reseting this unit */
+#define ESC_NS_RESET		13	/* We are resetting this unit */
 
 /* SCSI nexus flags */
 #define ESC_NF_UNIT_BUSY	0x0001	/* Unit is not available */
diff --git a/sys/arch/acorn32/podulebus/sfas.c b/sys/arch/acorn32/podulebus/sfas.c
index f5d42d74bf9..004e590ccfe 100644
--- a/sys/arch/acorn32/podulebus/sfas.c
+++ b/sys/arch/acorn32/podulebus/sfas.c
@@ -1023,7 +1023,7 @@ sfas_midaction(struct sfas_softc *dev, sfas_regmap_p rp, struct nexus *nexus)
 
 		case SFAS_NS_RESET:
 			/*
-			 * We were reseting this SCSI-unit. Clean up the
+			 * We were resetting this SCSI-unit. Clean up the
 			 * nexus struct.
 			 */
 			dev->sc_led(dev, 0);
diff --git a/sys/arch/acorn32/podulebus/sfasvar.h b/sys/arch/acorn32/podulebus/sfasvar.h
index 2266d4b2322..cee484cda9b 100644
--- a/sys/arch/acorn32/podulebus/sfasvar.h
+++ b/sys/arch/acorn32/podulebus/sfasvar.h
@@ -129,7 +129,7 @@ struct nexus {
 #define SFAS_NS_RESELECTED	10	/* We was reselected */
 #define SFAS_NS_DONE		11	/* Done. Prephsase to FINISHED */
 #define SFAS_NS_FINISHED	12	/* Realy done. Call scsi_done */
-#define SFAS_NS_RESET		13	/* We are reseting this unit */
+#define SFAS_NS_RESET		13	/* We are resetting this unit */
 
 /* SCSI nexus flags */
 #define SFAS_NF_UNIT_BUSY	0x0001	/* Unit is not available */
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index 4cfadddc67a..f7bd71fc5d1 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -126,7 +126,7 @@ do {									\
 			 * The assumption here is that a positive
 			 * stack offset is the function epilogue,
 			 * which may come before callpc when an
-			 * agressive optimizer (like GCC 3.3 or later)
+			 * aggressive optimizer (like GCC 3.3 or later)
 			 * has moved part of the function "out of
 			 * line", past the epilogue. Therefore, ignore
 			 * the positive offset so that
diff --git a/sys/arch/arm/broadcom/bcm2835_gpio.c b/sys/arch/arm/broadcom/bcm2835_gpio.c
index 188d2858263..34f33a82385 100644
--- a/sys/arch/arm/broadcom/bcm2835_gpio.c
+++ b/sys/arch/arm/broadcom/bcm2835_gpio.c
@@ -870,7 +870,7 @@ bcm2835gpio_gpio_pin_ctl(void *arg, int pin, int flags)
 	mutex_enter(&sc->sc_lock);
 	if (flags & (GPIO_PIN_OUTPUT|GPIO_PIN_INPUT)) {
 		if ((flags & GPIO_PIN_INPUT) != 0) {
-			/* for safety INPUT will overide output */
+			/* for safety INPUT will override output */
 			bcm283x_pin_setfunc(sc, pin, BCM2835_GPIO_IN);
 		} else {
 			bcm283x_pin_setfunc(sc, pin, BCM2835_GPIO_OUT);
diff --git a/sys/arch/arm/imx/imx51_ccm.c b/sys/arch/arm/imx/imx51_ccm.c
index 89b78795968..067ab7f8050 100644
--- a/sys/arch/arm/imx/imx51_ccm.c
+++ b/sys/arch/arm/imx/imx51_ccm.c
@@ -595,7 +595,7 @@ imx51_clk_gating(int clk_src, int mode)
 	case CCGR_EPDC_AXI_CLK:
 		reg = bus_space_read_4(iot, ioh, CCMC_EPDC_AXI);
 		reg &= ~EPDC_AXI_CLKGATE;
-		reg |= EPDC_AXI_CLKGATE_ALLWAYS;
+		reg |= EPDC_AXI_CLKGATE_ALWAYS;
 		bus_space_write_4(iot, ioh, CCMC_EPDC_AXI, reg);
 
 		/* enable auto-slow */
@@ -607,7 +607,7 @@ imx51_clk_gating(int clk_src, int mode)
 	case CCGR_EPDC_PIX_CLK:
 		reg = bus_space_read_4(iot, ioh, CCMC_EPDC_PIX);
 		reg &= ~EPDC_PIX_CLKGATE;
-		reg |= EPDC_PIX_CLKGATE_ALLWAYS;
+		reg |= EPDC_PIX_CLKGATE_ALWAYS;
 		bus_space_write_4(iot, ioh, CCMC_EPDC_PIX, reg);
 
 		break;
diff --git a/sys/arch/arm/imx/imx51_ccmreg.h b/sys/arch/arm/imx/imx51_ccmreg.h
index 624152a56bc..468f1c59631 100644
--- a/sys/arch/arm/imx/imx51_ccmreg.h
+++ b/sys/arch/arm/imx/imx51_ccmreg.h
@@ -153,7 +153,7 @@
 #define	 EPDC_PIX_CLKGATE		__BITS(31, 30)
 #define	 EPDC_PIX_CLKGATE_OFF		__SHIFTIN(0, EPDC_AXI_CLKGATE)
 #define	 EPDC_PIX_CLKGATE_RUNMODE	__SHIFTIN(1, EPDC_AXI_CLKGATE)
-#define	 EPDC_PIX_CLKGATE_ALLWAYS	__SHIFTIN(2, EPDC_AXI_CLKGATE)
+#define	 EPDC_PIX_CLKGATE_ALWAYS	__SHIFTIN(2, EPDC_AXI_CLKGATE)
 #define	 EPDC_PIX_CLKGATE_EXCEPTSTOP	__SHIFTIN(3, EPDC_AXI_CLKGATE)
 #define	 EPDC_PIX_CLK_PRED		__BITS(13, 12)
 #define	 EPDC_PIX_CLK_PODF		__BITS(11, 0)
@@ -161,7 +161,7 @@
 #define	 EPDC_AXI_CLKGATE		__BITS(31, 30)
 #define	 EPDC_AXI_CLKGATE_OFF		__SHIFTIN(0, EPDC_AXI_CLKGATE)
 #define	 EPDC_AXI_CLKGATE_RUNMODE	__SHIFTIN(1, EPDC_AXI_CLKGATE)
-#define	 EPDC_AXI_CLKGATE_ALLWAYS	__SHIFTIN(2, EPDC_AXI_CLKGATE)
+#define	 EPDC_AXI_CLKGATE_ALWAYS	__SHIFTIN(2, EPDC_AXI_CLKGATE)
 #define	 EPDC_AXI_CLKGATE_EXCEPTSTOP	__SHIFTIN(3, EPDC_AXI_CLKGATE)
 #define	 EPDC_ASM_EN			__BIT(9)
 #define	 EPDC_ASM_SLOW_DIV		__BITS(8, 6)
diff --git a/sys/arch/arm/omap/omapl1x_timer.c b/sys/arch/arm/omap/omapl1x_timer.c
index 7810412ded5..5a9eaf17d44 100644
--- a/sys/arch/arm/omap/omapl1x_timer.c
+++ b/sys/arch/arm/omap/omapl1x_timer.c
@@ -486,7 +486,7 @@ omapl1xtimer_attach (device_t parent, device_t self, void *aux)
 	wdt.wdt_addr = OMAPL1X_WDT_ADDR;
 	wdt.wdt_size = OMAPL1X_WDT_SIZE;
 
-	/* Map WDT registers. We want to use it for reseting the chip */
+	/* Map WDT registers. We want to use it for resetting the chip */
 	if (bus_space_map(wdt.wdt_iot, wdt.wdt_addr,
 			  wdt.wdt_size, 0, &wdt.wdt_ioh)) {
 		aprint_error_dev(self, "can't map wdt mem space\n");
diff --git a/sys/arch/arm/xscale/ixp425_npe.c b/sys/arch/arm/xscale/ixp425_npe.c
index 3da01eaa660..543cb48fcf5 100644
--- a/sys/arch/arm/xscale/ixp425_npe.c
+++ b/sys/arch/arm/xscale/ixp425_npe.c
@@ -749,7 +749,7 @@ npe_cpu_reset(struct ixpnpe_softc *sc)
     while (npe_checkbits(sc,
 	  IX_NPEDL_REG_OFFSET_STAT, IX_NPEDL_MASK_STAT_IFNE)) {
 	/*
-	 * Step execution of the NPE intruction to read inFIFO using
+	 * Step execution of the NPE instruction to read inFIFO using
 	 * the Debug Executing Context stack.
 	 */
 	error = npe_cpu_step(sc, IX_NPEDL_INSTR_RD_FIFO, 0, 0);
@@ -1133,7 +1133,7 @@ npe_logical_reg_read(struct ixpnpe_softc *sc,
     npeInstruction |= (regAddr << IX_NPEDL_OFFSET_INSTR_SRC) |
 	(regAddr << IX_NPEDL_OFFSET_INSTR_DEST);
 
-    /* step execution of NPE intruction using Debug Executing Context stack */
+    /* step execution of NPE instruction using Debug Executing Context stack */
     error = npe_cpu_step(sc, npeInstruction, ctxtNum, IX_NPEDL_RD_INSTR_LDUR);
     if (error != 0) {
 	DPRINTF(sc->sc_dev, "%s(0x%x, %u, %u), cannot step, error %d\n",
diff --git a/sys/arch/arm/xscale/ixp425_npereg.h b/sys/arch/arm/xscale/ixp425_npereg.h
index 9dd2779d09d..affe382150a 100644
--- a/sys/arch/arm/xscale/ixp425_npereg.h
+++ b/sys/arch/arm/xscale/ixp425_npereg.h
@@ -134,7 +134,7 @@
 
 /*
  * Reset value for Mailbox (MBST) register
- * NOTE that if used, it should be complemented with an NPE intruction
+ * NOTE that if used, it should be complemented with an NPE instruction
  * to clear the Mailbox at the NPE side as well
  */
 #define IX_NPEDL_REG_RESET_MBST              0x0000F0F0
diff --git a/sys/arch/cesfic/cesfic/pmap_bootstrap.c b/sys/arch/cesfic/cesfic/pmap_bootstrap.c
index e6f99034d87..750ad0ec44e 100644
--- a/sys/arch/cesfic/cesfic/pmap_bootstrap.c
+++ b/sys/arch/cesfic/cesfic/pmap_bootstrap.c
@@ -410,7 +410,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
 	 * Note about avail_end: msgbuf is initialized just after
 	 * avail_end in machdep.c.
 	 * Since the last page is used for rebooting the system
-	 * (code is copied there and excution continues from copied code
+	 * (code is copied there and execution continues from copied code
 	 * before the MMU is disabled), the msgbuf will get trounced
 	 * between reboots if it's placed in the last physical page.
 	 * To work around this, we move avail_end back one more
diff --git a/sys/arch/evbmips/adm5120/machdep.c b/sys/arch/evbmips/adm5120/machdep.c
index b5e12181200..8aaf58e4a49 100644
--- a/sys/arch/evbmips/adm5120/machdep.c
+++ b/sys/arch/evbmips/adm5120/machdep.c
@@ -482,7 +482,7 @@ cpu_reboot(int howto, char *bootstr)
 		cnpollc(0);
 	}
 
-	printf("reseting board...\n\n");
+	printf("resetting board...\n\n");
 	mips_icache_sync_all();
 	mips_dcache_wbinv_all();
 	SW_WRITE(SW_SFTRES_REG, 0);			/* reset */
diff --git a/sys/arch/evbmips/alchemy/machdep.c b/sys/arch/evbmips/alchemy/machdep.c
index 8e55e5cd111..a693376699b 100644
--- a/sys/arch/evbmips/alchemy/machdep.c
+++ b/sys/arch/evbmips/alchemy/machdep.c
@@ -412,7 +412,7 @@ cpu_reboot(int howto, char *bootstr)
 		cnpollc(0);
 	}
 
-	printf("reseting board...\n\n");
+	printf("resetting board...\n\n");
 
 	/*
 	 * Try to use board-specific reset logic, which might involve a better
diff --git a/sys/arch/evbmips/atheros/machdep.c b/sys/arch/evbmips/atheros/machdep.c
index be782812aab..dbeaaa3e750 100644
--- a/sys/arch/evbmips/atheros/machdep.c
+++ b/sys/arch/evbmips/atheros/machdep.c
@@ -373,7 +373,7 @@ cpu_reboot(int howto, char *bootstr)
 		cnpollc(0);
 	}
 
-	printf("reseting board...\n\n");
+	printf("resetting board...\n\n");
 	mips_icache_sync_all();
 	mips_dcache_wbinv_all();
 	atheros_reset();
diff --git a/sys/arch/evbmips/ingenic/machdep.c b/sys/arch/evbmips/ingenic/machdep.c
index e31413d5819..76bcbd435af 100644
--- a/sys/arch/evbmips/ingenic/machdep.c
+++ b/sys/arch/evbmips/ingenic/machdep.c
@@ -329,7 +329,7 @@ haltsys:
 		cnpollc(0);
 	}
 
-	printf("reseting board...\n\n");
+	printf("resetting board...\n\n");
 	mips_icache_sync_all();
 	mips_dcache_wbinv_all();
 	ingenic_reset();
diff --git a/sys/arch/evbmips/rasoc/machdep.c b/sys/arch/evbmips/rasoc/machdep.c
index 091265bf6ef..d4901a62afb 100644
--- a/sys/arch/evbmips/rasoc/machdep.c
+++ b/sys/arch/evbmips/rasoc/machdep.c
@@ -278,7 +278,7 @@ cpu_reboot(int howto, char *bootstr)
 		cnpollc(0);
 	}
 
-	printf("reseting board...\n\n");
+	printf("resetting board...\n\n");
 	mips_icache_sync_all();
 	mips_dcache_wbinv_all();
 
diff --git a/sys/arch/ews4800mips/sbd/if_iee_sbdio.c b/sys/arch/ews4800mips/sbd/if_iee_sbdio.c
index a3d346cc7ef..4fc8653322d 100644
--- a/sys/arch/ews4800mips/sbd/if_iee_sbdio.c
+++ b/sys/arch/ews4800mips/sbd/if_iee_sbdio.c
@@ -160,7 +160,7 @@ iee_sbdio_reset(struct iee_softc *sc)
 	cmd = IEE_PORT_SCP | IEE_PHYS_SHMEM(sc->sc_scp_off);
 
 	/* Initiate a Hardware reset. */
-	printf("%s: reseting chip... ", device_xname(sc->sc_dev));
+	printf("%s: resetting chip... ", device_xname(sc->sc_dev));
 	iee_sbdio_chip_reset(sc);
 
 	/* Set SCP address to CU */
diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c
index 83346c14af2..09fe0cce535 100644
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c
@@ -446,7 +446,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
 	 * Note about avail_end: msgbuf is initialized just after
 	 * avail_end in machdep.c.
 	 * Since the last page is used for rebooting the system
-	 * (code is copied there and excution continues from copied code
+	 * (code is copied there and execution continues from copied code
 	 * before the MMU is disabled), the msgbuf will get trounced
 	 * between reboots if it's placed in the last physical page.
 	 * To work around this, we move avail_end back one more
diff --git a/sys/arch/hppa/dev/ssio.c b/sys/arch/hppa/dev/ssio.c
index ef159f36654..47aa4fdac3c 100644
--- a/sys/arch/hppa/dev/ssio.c
+++ b/sys/arch/hppa/dev/ssio.c
@@ -285,7 +285,7 @@ ssio_attach(device_t parent, device_t self, void *aux)
 
 #if NUKBD > 0
 	/*
-	 * If a USB keybard is used for console input, the firmware passes
+	 * If a USB keyboard is used for console input, the firmware passes
 	 * the mmio address of the USB controller the keyboard is attached
 	 * to.  Since we know the USB controller is function 2 on the same
 	 * device and comes right after us (we're function 1 remember),
diff --git a/sys/arch/m68k/060sp/dist/isp.s b/sys/arch/m68k/060sp/dist/isp.s
index 4048e892ef1..4927a542043 100644
--- a/sys/arch/m68k/060sp/dist/isp.s
+++ b/sys/arch/m68k/060sp/dist/isp.s
@@ -609,7 +609,7 @@ uieh_finish:
 # The instruction that was just emulated was also being traced. The trace 
 # trap for this instruction will be lost unless we jump to the trace handler.
 # So, here we create a Trace Exception format number two exception stack
-# frame from the Unimplemented Integer Intruction Exception stack frame
+# frame from the Unimplemented Integer Instruction Exception stack frame
 # format number zero and jump to the user supplied hook "_real_trace()".
 #
 #		   UIEH FRAME		   TRACE FRAME
diff --git a/sys/arch/m68k/m68k/db_disasm.c b/sys/arch/m68k/m68k/db_disasm.c
index 5b08df975b5..d01d7d0589e 100644
--- a/sys/arch/m68k/m68k/db_disasm.c
+++ b/sys/arch/m68k/m68k/db_disasm.c
@@ -175,7 +175,7 @@ static const char hexdigits[] = "0123456789abcdef";
 #endif
 
 /*
- * Disassemble intruction at location ``loc''.
+ * Disassemble instruction at location ``loc''.
  * Returns location of next instruction.
  */
 
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index cfd5024e2ca..0268b5347df 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -483,7 +483,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
 	 * Note about avail_end: msgbuf is initialized just after
 	 * avail_end in machdep.c.  Since the last page is used
 	 * for rebooting the system (code is copied there and
-	 * excution continues from copied code before the MMU
+	 * execution continues from copied code before the MMU
 	 * is disabled), the msgbuf will get trounced between
 	 * reboots if it's placed in the last physical page.
 	 * To work around this, we move avail_end back one more
diff --git a/sys/arch/mips/rmi/rmixlreg.h b/sys/arch/mips/rmi/rmixlreg.h
index 47bfd34390b..a7e86b455c5 100644
--- a/sys/arch/mips/rmi/rmixlreg.h
+++ b/sys/arch/mips/rmi/rmixlreg.h
@@ -69,8 +69,8 @@
 					/*			v	 v  v  v	*/
 #define RMIXL_COP_2_TXBUF	_(0)	/* Transmit Buffers	64	[1][4] L	*/
 #define RMIXL_COP_2_RXBUF	_(1)	/* Receive Buffers	64	[1][4] L	*/
-#define RMIXL_COP_2_MSG_STS	_(2)	/* Mesage Status	32	[1][2] L/G	*/
-#define RMIXL_COP_2_MSG_CFG	_(3)	/* MEssage Config	32	[1][2] G	*/
+#define RMIXL_COP_2_MSG_STS	_(2)	/* Message Status	32	[1][2] L/G	*/
+#define RMIXL_COP_2_MSG_CFG	_(3)	/* Message Config	32	[1][2] G	*/
 #define RMIXL_COP_2_MSG_BSZ	_(4)	/* Message Bucket Size	32	[1][8] G	*/
 #define RMIXL_COP_2_CREDITS	_(16)	/* Credit Counters	 8     [16][8] G	*/
 
diff --git a/sys/arch/powerpc/booke/spe_subr.S b/sys/arch/powerpc/booke/spe_subr.S
index 560726cd333..689a34c6776 100644
--- a/sys/arch/powerpc/booke/spe_subr.S
+++ b/sys/arch/powerpc/booke/spe_subr.S
@@ -56,7 +56,7 @@ ENTRY(vec_load_from_vreg)
 	 * are loading it), and we know SPE is on (to load it), just load two
 	 * high parts at one time and merge appropriately.  For each even-odd
 	 * register pair, the evldw will load high part for the even register
-	 * in the high 32 bits and the high part for the odd regiter in the
+	 * in the high 32 bits and the high part for the odd register in the
 	 * low 32 bits.
 	 *
 	 * The evmergelo will move the lower half of r0 to the high half of the
diff --git a/sys/arch/powerpc/powerpc/db_interface.c b/sys/arch/powerpc/powerpc/db_interface.c
index ea13532ca0e..e5783031093 100644
--- a/sys/arch/powerpc/powerpc/db_interface.c
+++ b/sys/arch/powerpc/powerpc/db_interface.c
@@ -569,7 +569,7 @@ static void
 db_ppc4xx_reset(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
 {
-	printf("Reseting...\n");
+	printf("Resetting...\n");
 	ppc4xx_reset();
 }
 
diff --git a/sys/arch/powerpc/stand/mkbootimage/rs6000_bootrec.h b/sys/arch/powerpc/stand/mkbootimage/rs6000_bootrec.h
index 7e35d33700d..e9d19222bd8 100644
--- a/sys/arch/powerpc/stand/mkbootimage/rs6000_bootrec.h
+++ b/sys/arch/powerpc/stand/mkbootimage/rs6000_bootrec.h
@@ -9,7 +9,7 @@
 #define CONFRECID	0xF8E9DACB	/* no idea */
 
 typedef struct rs6000_boot_record {
-	uint32_t	ipl_record;	/* allways IPLRECID */
+	uint32_t	ipl_record;	/* always IPLRECID */
 	char		pad1[20];
 	uint32_t	formatted_cap;	/* sectors in the disk */
 	char		floppy_last_head; /* nrof heads -1 */
diff --git a/sys/arch/prep/pnpbus/fdc_pnpbus.c b/sys/arch/prep/pnpbus/fdc_pnpbus.c
index a57e64e34b9..a51e0c432f2 100644
--- a/sys/arch/prep/pnpbus/fdc_pnpbus.c
+++ b/sys/arch/prep/pnpbus/fdc_pnpbus.c
@@ -158,7 +158,7 @@ fdc_pnpbus_attach(device_t parent, device_t self, void *aux)
 
 	aprint_normal("\n");
 
-	/* The 7043-140 gets the type wrong, so overide to edge allways */
+	/* The 7043-140 gets the type wrong, so override to edge always */
 	fdc->sc_ih = pnpbus_intr_establish(0, IPL_BIO, IST_EDGE, fdcintr, fdc,
 	    &pna->pna_res);
 
diff --git a/sys/arch/sgimips/sgimips/machdep.c b/sys/arch/sgimips/sgimips/machdep.c
index fb5db28f04a..f776ec702e6 100644
--- a/sys/arch/sgimips/sgimips/machdep.c
+++ b/sys/arch/sgimips/sgimips/machdep.c
@@ -372,7 +372,7 @@ mach_init(int argc, int32_t argv32[], uintptr_t magic, int32_t bip32)
 		panic("invalid architecture");
 
 	/*
-	 * Get boot device infomation.
+	 * Get boot device information.
 	 */
 
 	/* Try to get the boot device information from bootinfo first. */
diff --git a/sys/arch/sh3/sh3/exception_vector.S b/sys/arch/sh3/sh3/exception_vector.S
index 0a89941fef4..47ca3144f8b 100644
--- a/sys/arch/sh3/sh3/exception_vector.S
+++ b/sys/arch/sh3/sh3/exception_vector.S
@@ -378,7 +378,7 @@ NENTRY(sh4_vector_tlbmiss)
 	bt/s	.L4_call_tlb_exception
 	 mov	#-(PGSHIFT - 2), r1
 
-	!! __PMAP_PTP_OFSET(vpn) - except we pre-shift 2 bits left to
+	!! __PMAP_PTP_OFFSET(vpn) - except we pre-shift 2 bits left to
 	!! get the array offset directly, as we know bits 10 and 11
 	!! are zero (we cleaned them in r5 to get 4K aligned VPN)
 	shld	r1, r2		! vpn >> (PGSHIFT - 2)
diff --git a/sys/arch/sh3/sh3/pmap.c b/sys/arch/sh3/sh3/pmap.c
index 0eb272d8e44..7d4089933fc 100644
--- a/sys/arch/sh3/sh3/pmap.c
+++ b/sys/arch/sh3/sh3/pmap.c
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.82 2017/02/02 21:35:29 uwe Exp $");
 	(((va) + (1 << __PMAP_PTP_SHIFT) - 1) & ~((1 << __PMAP_PTP_SHIFT) - 1))
 #define	__PMAP_PTP_PG_N		(PAGE_SIZE / sizeof(pt_entry_t))
 #define	__PMAP_PTP_INDEX(va)	(((va) >> __PMAP_PTP_SHIFT) & (__PMAP_PTP_N - 1))
-#define	__PMAP_PTP_OFSET(va)	((va >> PGSHIFT) & (__PMAP_PTP_PG_N - 1))
+#define	__PMAP_PTP_OFFSET(va)	((va >> PGSHIFT) & (__PMAP_PTP_PG_N - 1))
 
 struct pmap __pmap_kernel;
 struct pmap *const kernel_pmap_ptr = &__pmap_kernel;
@@ -963,7 +963,7 @@ __pmap_pte_alloc(pmap_t pmap, vaddr_t va)
 	ptp = (pt_entry_t *)SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg));
 	pmap->pm_ptp[__PMAP_PTP_INDEX(va)] = ptp;
 
-	return (ptp + __PMAP_PTP_OFSET(va));
+	return (ptp + __PMAP_PTP_OFFSET(va));
 }
 
 /*
diff --git a/sys/arch/shark/shark/opms.c b/sys/arch/shark/shark/opms.c
index 0790eae75e5..031b0c37998 100644
--- a/sys/arch/shark/shark/opms.c
+++ b/sys/arch/shark/shark/opms.c
@@ -66,7 +66,7 @@
 **
 **  ABSTRACT:
 **
-**    The mose driver has been cleand up for use with the PC87307VUL
+**    The mouse driver has been cleaned up for use with the PC87307VUL
 **    Super I/O chip.  The main modification has been to change the 
 **    driver to use the bus_space_ macros.  This allows the mouse
 **    to be configured to any base address.  It relies on the keyboard
@@ -75,7 +75,7 @@
 **    NOTE : The mouse is an auxiliary device off the keyboard and as such
 **           shares the same device registers.  This shouldn't be an issue
 **           since each logical device generates its own unique IRQ.  But
-**           it is worth noting that reseting or mucking with one can affect
+**           it is worth noting that resetting or mucking with one can affect
 **           the other.
 **
 **  AUTHORS:
diff --git a/sys/arch/sparc/stand/bootblk/bootblk.fth b/sys/arch/sparc/stand/bootblk/bootblk.fth
index db0ada5b049..38d747196bb 100644
--- a/sys/arch/sparc/stand/bootblk/bootblk.fth
+++ b/sys/arch/sparc/stand/bootblk/bootblk.fth
@@ -341,7 +341,7 @@ defer if_daddr
 
 niaddr /w* constant narraysize
 
-\ Assume UFS2 dinodes are always biger than UFS1
+\ Assume UFS2 dinodes are always bigger than UFS1
 ufs2_dinode_SIZEOF buffer: cur-inode
 0 value indir-block
 create indir-addr -1 , -1 ,
diff --git a/sys/arch/sparc64/dev/iommuvar.h b/sys/arch/sparc64/dev/iommuvar.h
index 08dd76a1a55..f6b83dba0ae 100644
--- a/sys/arch/sparc64/dev/iommuvar.h
+++ b/sys/arch/sparc64/dev/iommuvar.h
@@ -53,7 +53,7 @@ struct iommu_state {
 	int			is_tsbsize;	/* 0 = 8K, ... */
 	u_int			is_dvmabase;
 	u_int			is_dvmaend;
-	int64_t			is_cr;		/* IOMMU control regiter value */
+	int64_t			is_cr;		/* IOMMU control register value */
 	struct extent		*is_dvmamap;	/* DVMA map for this instance */
 	kmutex_t		is_lock;	/* lock for DVMA map */
 	int			is_flags;
diff --git a/sys/arch/usermode/usermode/pmap.c b/sys/arch/usermode/usermode/pmap.c
index 125456fe265..d3a34e528b8 100644
--- a/sys/arch/usermode/usermode/pmap.c
+++ b/sys/arch/usermode/usermode/pmap.c
@@ -356,7 +356,7 @@ pmap_bootstrap(void)
         pmap = pmap_kernel();
         memset(pmap, 0, sizeof(*pmap));
 	pmap->pm_count = 1;		/* reference */
-	pmap->pm_flags = PM_ACTIVE;	/* kernel pmap is allways active */
+	pmap->pm_flags = PM_ACTIVE;	/* kernel pmap is always active */
 	pmap->pm_l1 = (struct pmap_l2 **) kmem_kvm_cur_start;
 
 	pm_l1_fpos = fpos;
diff --git a/sys/arch/vax/vax/db_disasm.c b/sys/arch/vax/vax/db_disasm.c
index 63416ad5d65..215e1cad3b0 100644
--- a/sys/arch/vax/vax/db_disasm.c
+++ b/sys/arch/vax/vax/db_disasm.c
@@ -231,7 +231,7 @@ get_operands(inst_buffer *ib)
 				ib->off = get_long(ib);
 				break;
 			default:
-				err_print("XXX eror\n");
+				err_print("XXX error\n");
 			}
 			/* add_int(ib, ib->off); */
 			ib->addr = (u_int) ib->ppc + ib->off;
diff --git a/sys/arch/xen/xen/xenevt.c b/sys/arch/xen/xen/xenevt.c
index c15830831b5..efb14d52aa0 100644
--- a/sys/arch/xen/xen/xenevt.c
+++ b/sys/arch/xen/xen/xenevt.c
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.54 2019/11/22 14:30:58 martin Exp $");
 
 /*
  * Interface between the event channel and userland.
- * Each process with a xenevt device instance open can regiter events it
+ * Each process with a xenevt device instance open can register events it
  * wants to receive. It will get pending events by read(), eventually blocking
  * until some event is available. Pending events are ack'd by a bitmask
  * write()en to the device. Some special operations (such as events binding)
diff --git a/sys/dev/bi/kdbreg.h b/sys/dev/bi/kdbreg.h
index f978f31c455..fbb475899fb 100644
--- a/sys/dev/bi/kdbreg.h
+++ b/sys/dev/bi/kdbreg.h
@@ -58,7 +58,7 @@ struct	kdb_regs {
  * Asserting KDB_MAP in values placed in mscp_seq.seq_buffer tells
  * the KDB to use mscp_seq.seq_mapbase as a set of PTEs and seq_buffer
  * as an offset value.  Hence we need no mappings; the KDB50 reads
- * the hardware page tables directly.  (Without KDB_MAP, seq_bufer
+ * the hardware page tables directly.  (Without KDB_MAP, seq_buffer
  * represents the physical memory address instead, and seq_mapbase is
  * unused.)
  */
diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c
index 0810aed8033..5c17bf8d3b1 100644
--- a/sys/dev/cardbus/fwohci_cardbus.c
+++ b/sys/dev/cardbus/fwohci_cardbus.c
@@ -127,7 +127,7 @@ fwohci_cardbus_attach(device_t parent, device_t self, void *aux)
 		return;
 	}
 
-	/* XXX NULL should be replaced by some call to Cardbus coed */
+	/* XXX NULL should be replaced by some call to Cardbus code */
 	if (fwohci_attach(&sc->sc_sc) != 0) {
 		Cardbus_intr_disestablish(ct, sc->sc_ih);
 		sc->sc_ih = NULL;
diff --git a/sys/dev/hpc/files.hpcio b/sys/dev/hpc/files.hpcio
index fa54b5237a4..56e39d10e93 100644
--- a/sys/dev/hpc/files.hpcio
+++ b/sys/dev/hpc/files.hpcio
@@ -3,7 +3,7 @@
 
 #  platform:
 #    iochip: sepecify GPIO chip
-#    evtype: event tyep of config_hook
+#    evtype: event type of config_hook
 #        id: event id of config_hook
 #      port: port number on GPIO
 #    active: which value is 'ON', 0 or 1.
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 47a5c3098c3..b508327fadd 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1132,7 +1132,7 @@ adw_isr_callback(ADW_SOFTC *sc, ADW_SCSI_REQ_Q *scsiq)
 			 * the host adapter.
 			 */
 			aprint_error_dev(sc->sc_dev,
-			    "DMA Error. Reseting bus\n");
+			    "DMA Error. Resetting bus\n");
 			TAILQ_REMOVE(&sc->sc_pending_ccb, ccb, chain);
 			adw_reset_bus(sc);
 			xs->error = XS_BUSY;
@@ -1141,7 +1141,7 @@ adw_isr_callback(ADW_SOFTC *sc, ADW_SCSI_REQ_Q *scsiq)
 		case QHSTA_M_WTM_TIMEOUT:
 		case QHSTA_M_SXFR_WD_TMO:
 			/* The SCSI bus hung in a phase */
-			printf("%s: Watch Dog timer expired. Reseting bus\n",
+			printf("%s: Watch Dog timer expired. Resetting bus\n",
 				device_xname(sc->sc_dev));
 			TAILQ_REMOVE(&sc->sc_pending_ccb, ccb, chain);
 			adw_reset_bus(sc);
diff --git a/sys/dev/ic/ahcisatareg.h b/sys/dev/ic/ahcisatareg.h
index 2301bfb504a..699f81bfac3 100644
--- a/sys/dev/ic/ahcisatareg.h
+++ b/sys/dev/ic/ahcisatareg.h
@@ -120,7 +120,7 @@ struct ahci_r_fis {
 #define		AHCI_CAP_IS_GEN3	0x00300000 /* 6.0 Gb/s */
 #define		AHCI_CAP_CLO	0x01000000 /* Command list override */
 #define		AHCI_CAP_AL	0x02000000 /* Single Activitly LED */
-#define		AHCI_CAP_ALP	0x04000000 /* Agressive link power management */
+#define		AHCI_CAP_ALP	0x04000000 /* Aggressive link power management */
 #define		AHCI_CAP_SSU	0x08000000 /* Staggered spin-up */
 #define		AHCI_CAP_MPS	0x10000000 /* Mechanical swicth */
 #define		AHCI_CAP_NTF	0x20000000 /* Snotification */
@@ -221,8 +221,8 @@ struct ahci_r_fis {
 #define		AHCI_P_CMD_ICC_PA   0x20000000 /* State partial */
 #define		AHCI_P_CMD_ICC_AC   0x10000000 /* State active */
 #define		AHCI_P_CMD_ICC_NO   0x00000000 /* State idle/NOP */
-#define		AHCI_P_CMD_ASP	0x08000000 /* Agressive Slumber/Partial */
-#define		AHCI_P_CMD_ALPE	0x04000000 /* Agressive link power management */
+#define		AHCI_P_CMD_ASP	0x08000000 /* Aggressive Slumber/Partial */
+#define		AHCI_P_CMD_ALPE	0x04000000 /* Aggressive link power management */
 #define		AHCI_P_CMD_DLAE	0x02000000 /* drive LED on ATAPI */
 #define		AHCI_P_CMD_ATAP	0x01000000 /* Device is ATAPI */
 #define		AHCI_P_CMD_ESP	0x00200000 /* external SATA port */
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index 995bb305f33..77f0b6ab52f 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1963,7 +1963,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
 		ahd_outb(ahd, CLRINT, CLRSCSIINT);
 		ahd_unpause(ahd);
 	} else {
-		printf("Reseting Channel for LQI Phase error\n");
+		printf("Resetting Channel for LQI Phase error\n");
 		ahd_dump_card_state(ahd);
 		ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
 	}
@@ -8429,7 +8429,7 @@ ahd_check_patch(struct ahd_softc *ahd, struct patch **start_patch,
 			cur_patch += cur_patch->skip_patch;
 		} else {
 			/* Accepted this patch.  Advance to the next
-			 * one and wait for our intruction pointer to
+			 * one and wait for our instruction pointer to
 			 * hit this point.
 			 */
 			cur_patch++;
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index a8c44f1f781..583624d3b94 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -6391,7 +6391,7 @@ ahc_check_patch(struct ahc_softc *ahc, struct patch **start_patch,
 			cur_patch += cur_patch->skip_patch;
 		} else {
 			/* Accepted this patch.  Advance to the next
-			 * one and wait for our intruction pointer to
+			 * one and wait for our instruction pointer to
 			 * hit this point.
 			 */
 			cur_patch++;
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index d243eee5dd6..1d492e3214e 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -403,7 +403,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 	/*
 	 * Allocate hardware transmit queues: one queue for
 	 * beacon frames and one data queue for each QoS
-	 * priority.  Note that the hal handles reseting
+	 * priority.  Note that the hal handles resetting
 	 * these queues at the needed time.
 	 *
 	 * XXX PS-Poll
@@ -4551,7 +4551,7 @@ ath_dfswait(void *arg)
 
 /*
  * Set/change channels.  If the channel is really being changed,
- * it's done by reseting the chip.  To accomplish this we must
+ * it's done by resetting the chip.  To accomplish this we must
  * first cleanup any pending DMA, then restart stuff after a la
  * ath_init.
  */
diff --git a/sys/dev/ic/atppc.c b/sys/dev/ic/atppc.c
index e50ca8233bb..263775603d5 100644
--- a/sys/dev/ic/atppc.c
+++ b/sys/dev/ic/atppc.c
@@ -1942,7 +1942,7 @@ atppc_ecp_read_error(struct atppc_softc *atppc)
 	/* Check for invalid states */
 	if ((ecr & ATPPC_FIFO_EMPTY) && (ecr & ATPPC_FIFO_FULL)) {
 		ATPPC_DPRINTF(("%s: FIFO full+empty bits set.\n", __func__));
-		ATPPC_DPRINTF(("%s: reseting FIFO.\n", __func__));
+		ATPPC_DPRINTF(("%s: resetting FIFO.\n", __func__));
 		atppc_w_ecr(atppc, ATPPC_ECR_PS2);
 		atppc_barrier_w(atppc);
 	}
@@ -2310,7 +2310,7 @@ atppc_fifo_write_error(struct atppc_softc * const atppc,
 		atppc->sc_outbstart += worklen;
 	}
 
-	ATPPC_DPRINTF(("%s: reseting FIFO.\n", __func__));
+	ATPPC_DPRINTF(("%s: resetting FIFO.\n", __func__));
 	atppc_w_ecr(atppc, ATPPC_ECR_PS2);
 	atppc_barrier_w(atppc);
 }
diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c
index 0a5775ee9d6..cf0f4536866 100644
--- a/sys/dev/ic/cs89x0.c
+++ b/sys/dev/ic/cs89x0.c
@@ -138,7 +138,7 @@
 **     to start transmitting after 381 bytes have been fed to it.  if that
 **     gets transmit underruns, ramp down to 1021 bytes then "whole
 **     packet."  If successful at a given level for a while, try the next
-**     more agressive level.  This code doesn't ever try to start
+**     more aggressive level.  This code doesn't ever try to start
 **     transmitting after 5 bytes have been sent to the NIC, because
 **     that underruns rather regularly.  The back-off and ramp-up mechanism
 **     could probably be tuned a little bit, but this works well enough to
@@ -175,7 +175,7 @@
 **       infrequent event.  It could have been used in the IFF_PROMISCUOUS
 **       address check above, but the benefit of it vs. memcmp would be
 **       inconsequential, there.)  Use memcmp() instead.
-**     * restructure csStartOuput to avoid the following bugs in the case where
+**     * restructure csStartOutput to avoid the following bugs in the case where
 **       txWait was being set:
 **         * it would accidentally drop the outgoing packet if told to wait
 **           but the outgoing packet queue was empty.
diff --git a/sys/dev/ic/lemacreg.h b/sys/dev/ic/lemacreg.h
index 6fccab9fe1d..d0d9fc3ed32 100644
--- a/sys/dev/ic/lemacreg.h
+++ b/sys/dev/ic/lemacreg.h
@@ -121,7 +121,7 @@
 #define LEMAC_TX_ISA		0x01	/* Insert Source Address (no) */
 #define LEMAC_TX_IFC		0x02	/* Insert Frame Check (yes) */
 #define LEMAC_TX_PAD		0x04	/* Zero PAD to minimum length (yes) */
-#define LEMAC_TX_LAB		0x08	/* Less Agressive Backoff (no) */
+#define LEMAC_TX_LAB		0x08	/* Less Aggressive Backoff (no) */
 #define LEMAC_TX_QMD		0x10	/* Q-Mode (yes) */
 #define LEMAC_TX_STP		0x20	/* Stop on Error (no) */
 #define LEMAC_TX_SQE		0x40	/* SQE Enable (yes) */
diff --git a/sys/dev/ic/mfireg.h b/sys/dev/ic/mfireg.h
index a8572a9da25..4d6c606ecf3 100644
--- a/sys/dev/ic/mfireg.h
+++ b/sys/dev/ic/mfireg.h
@@ -985,7 +985,7 @@ struct mfi_ld_list {
 	} mll_list[MFI_MAX_LD];
 } __packed;
 
-/* logicl disk details from MR_DCMD_LD_GET_INFO */
+/* logical disk details from MR_DCMD_LD_GET_INFO */
 struct mfi_ld_prop {
 	struct mfi_ld		mlp_ld;
 	char			mlp_name[16];
diff --git a/sys/dev/ieee1394/fwdma.c b/sys/dev/ieee1394/fwdma.c
index 358ad9da859..ffd83e6a129 100644
--- a/sys/dev/ieee1394/fwdma.c
+++ b/sys/dev/ieee1394/fwdma.c
@@ -143,7 +143,7 @@ fwdma_alloc_setup(device_t dev, bus_dma_tag_t dmat, bus_size_t size,
 
 /*
  * Allocate multisegment dma buffers
- * each segment size is eqaul to ssize except last segment.
+ * each segment size is equal to ssize except last segment.
  */
 struct fwdma_alloc_multi *
 fwdma_malloc_multiseg(struct firewire_comm *fc, int alignment, int esize, int n,
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index cf637fb7b25..3d5f2ee51dd 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -667,7 +667,7 @@ check_patch(patch_t **start_patch, int start_instr,
 				cur_patch = STAILQ_NEXT(cur_patch, links);
 		} else {
 			/* Accepted this patch.  Advance to the next
-			 * one and wait for our intruction pointer to
+			 * one and wait for our instruction pointer to
 			 * hit this point.
 			 */
 			cur_patch = STAILQ_NEXT(cur_patch, links);
diff --git a/sys/dev/pci/if_ena.c b/sys/dev/pci/if_ena.c
index 3ac52edfffb..508d2662c2f 100644
--- a/sys/dev/pci/if_ena.c
+++ b/sys/dev/pci/if_ena.c
@@ -201,7 +201,7 @@ static const ena_vendor_info_t ena_vendor_info_array[] = {
 };
 
 /*
- * Contains pointers to event handlers, e.g. link state chage.
+ * Contains pointers to event handlers, e.g. link state change.
  */
 static struct ena_aenq_handlers aenq_handlers;
 
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 6e9d8bcd7f2..f76af1674a5 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1781,7 +1781,7 @@ vge_init(struct ifnet *ifp)
 	/* Set collision backoff algorithm */
 	CSR_CLRBIT_1(sc, VGE_CHIPCFG1, VGE_CHIPCFG1_CRANDOM |
 	    VGE_CHIPCFG1_CAP | VGE_CHIPCFG1_MBA | VGE_CHIPCFG1_BAKOPT);
-	CSR_SETBIT_1(sc, VGE_CHIPCFG1, VGE_CHIPCFG1_OFSET);
+	CSR_SETBIT_1(sc, VGE_CHIPCFG1, VGE_CHIPCFG1_OFFSET);
 
 	/* Disable LPSEL field in priority resolution */
 	CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_LPSEL_DIS);
diff --git a/sys/dev/pci/if_vgereg.h b/sys/dev/pci/if_vgereg.h
index f80d8eb85df..0f0452a7ec7 100644
--- a/sys/dev/pci/if_vgereg.h
+++ b/sys/dev/pci/if_vgereg.h
@@ -463,7 +463,7 @@
 #define VGE_CHIPCFG1_MBA	0x02
 #define VGE_CHIPCFG1_CAP	0x04
 #define VGE_CHIPCFG1_CRANDOM	0x08
-#define VGE_CHIPCFG1_OFSET	0x10
+#define VGE_CHIPCFG1_OFFSET	0x10
 #define VGE_CHIPCFG1_SLOTTIME	0x20	/* slot time 512/500 in giga mode */
 #define VGE_CHIPCFG1_MIIOPT	0x40
 #define VGE_CHIPCFG1_GTCKOPT	0x80
diff --git a/sys/dev/pci/ixgbe/ixgbe_common.c b/sys/dev/pci/ixgbe/ixgbe_common.c
index 27a04063cb4..cdaeb710884 100644
--- a/sys/dev/pci/ixgbe/ixgbe_common.c
+++ b/sys/dev/pci/ixgbe/ixgbe_common.c
@@ -5046,8 +5046,8 @@ s32 ixgbe_bypass_rw_generic(struct ixgbe_hw *hw, u32 cmd, u32 *status)
  * ixgbe_bypass_valid_rd_generic - Verify valid return from bit-bang.
  *
  * If we send a write we can't be sure it took until we can read back
- * that same register.  It can be a problem as some of the feilds may
- * for valid reasons change inbetween the time wrote the register and
+ * that same register.  It can be a problem as some of the fields may
+ * for valid reasons change in-between the time wrote the register and
  * we read it again to verify.  So this function check everything we
  * can check and then assumes it worked.
  *
@@ -5100,7 +5100,7 @@ bool ixgbe_bypass_valid_rd_generic(u32 in_reg, u32 out_reg)
 }
 
 /**
- *  ixgbe_bypass_set_generic - Set a bypass field in the FW CTRL Regiter.
+ *  ixgbe_bypass_set_generic - Set a bypass field in the FW CTRL Register.
  *
  *  @hw: pointer to hardware structure
  *  @cmd: The control word we are setting.
diff --git a/sys/dev/pci/ixgbe/ixgbe_vf.c b/sys/dev/pci/ixgbe/ixgbe_vf.c
index 515278c1b33..94eb6c11a9d 100644
--- a/sys/dev/pci/ixgbe/ixgbe_vf.c
+++ b/sys/dev/pci/ixgbe/ixgbe_vf.c
@@ -175,7 +175,7 @@ s32 ixgbe_init_hw_vf(struct ixgbe_hw *hw)
  *  ixgbe_reset_hw_vf - Performs hardware reset
  *  @hw: pointer to hardware structure
  *
- *  Resets the hardware by reseting the transmit and receive units, masks and
+ *  Resets the hardware by resetting the transmit and receive units, masks and
  *  clears all interrupts.
  **/
 s32 ixgbe_reset_hw_vf(struct ixgbe_hw *hw)
diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index 48db5bb4f82..22d387ca69e 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -1478,7 +1478,7 @@ scsipi_get_opcodeinfo(struct scsipi_periph *periph)
 
 /*
  * scsipi_update_timeouts:
- * 	Overide timeout value if device/config provided
+ * 	Override timeout value if device/config provided
  *      timeouts are available.
  */
 static void
diff --git a/sys/dev/spi/mcp23s17.c b/sys/dev/spi/mcp23s17.c
index a00457d3507..d2982aff615 100644
--- a/sys/dev/spi/mcp23s17.c
+++ b/sys/dev/spi/mcp23s17.c
@@ -274,7 +274,7 @@ mcp23s17gpio_gpio_pin_ctl(void *arg, int pin, int flags)
 	if (flags & (GPIO_PIN_OUTPUT|GPIO_PIN_INPUT)) {
 		data = mcp23s17gpio_read(sc, MCP23x17_IODIR(sc->sc_bank, port));
 		if ((flags & GPIO_PIN_INPUT) || !(flags & GPIO_PIN_OUTPUT)) {
-			/* for safety INPUT will overide output */
+			/* for safety INPUT will override output */
 			data |= bit;
 		} else {
 			data &= ~bit;
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index e64fef98b7c..819fd2097f5 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1042,7 +1042,7 @@ removede(struct denode *pdep, struct denode *dep)
 		offset += sizeof(struct direntry);
 		while (1) {
 			/*
-			 * We are a bit agressive here in that we delete any Win95
+			 * We are a bit aggressive here in that we delete any Win95
 			 * entries preceding this entry, not just the ones we "own".
 			 * Since these presumably aren't valid anyway,
 			 * there should be no harm.
diff --git a/sys/fs/puffs/puffs_vnops.c b/sys/fs/puffs/puffs_vnops.c
index e4d1aea76ec..d369a70dae1 100644
--- a/sys/fs/puffs/puffs_vnops.c
+++ b/sys/fs/puffs/puffs_vnops.c
@@ -1095,7 +1095,7 @@ puffs_vnop_getattr(void *v)
 	/*
 	 * A lock is required so that we do not race with 
 	 * setattr, write and fsync when changing vp->v_size.
-	 * This is critical, since setting a stall smaler value
+	 * This is critical, since setting a stall smaller value
 	 * triggers a file truncate in uvm_vnp_setsize(), which
 	 * most of the time means data corruption (a chunk of
 	 * data is replaced by zeroes). This can be removed if
diff --git a/sys/fs/udf/udf_allocation.c b/sys/fs/udf/udf_allocation.c
index 0a8ae737fd4..9924a28c4b1 100644
--- a/sys/fs/udf/udf_allocation.c
+++ b/sys/fs/udf/udf_allocation.c
@@ -1672,7 +1672,7 @@ udf_late_allocate_buf(struct udf_mount *ump, struct buf *buf,
 	if (error) {
 		/*
 		 * ARGH! we haven't done our accounting right! it should
-		 * allways succeed.
+		 * always succeed.
 		 */
 		panic("UDF disc allocation accounting gone wrong");
 	}
diff --git a/sys/fs/udf/udf_subr.c b/sys/fs/udf/udf_subr.c
index 1fc7aa25ee6..ae92a56cc10 100644
--- a/sys/fs/udf/udf_subr.c
+++ b/sys/fs/udf/udf_subr.c
@@ -2089,7 +2089,7 @@ udf_process_vds(struct udf_mount *ump) {
 	/*
 	 * Determine sheduler error behaviour. For virtual partitions, update
 	 * the trackinfo; for sparable partitions replace a whole block on the
-	 * sparable table. Allways requeue.
+	 * sparable table. Always requeue.
 	 */
 	ump->lvreadwrite = 0;
 	if (n_virt)
@@ -2320,7 +2320,7 @@ udf_create_parentfid(struct udf_mount *ump, struct fileid_desc *fid,
  * sub-files. In the stream directory a few fixed named subfiles are reserved
  * for NT/Unix ACL's and OS/2 attributes.
  * 
- * NOTE: Extended attributes are read randomly but allways written
+ * NOTE: Extended attributes are read randomly but always written
  * *atomicaly*. For ACL's this interface is propably different but not known
  * to me yet.
  *
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index baf1c53763c..778aa0dfb19 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -700,7 +700,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp,
 	/* setup rest of mount information */
 	mp->mnt_data = ump;
 
-	/* bshift is allways equal to disc sector size */
+	/* bshift is always equal to disc sector size */
 	mp->mnt_dev_bshift = bshift;
 	mp->mnt_fs_bshift  = bshift;
 
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 2288709511d..9d76a0e67ec 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1413,7 +1413,7 @@ ieee80211_ioctl_get80211_fbsd(struct ieee80211com *ic, u_long cmd,
  * themselves perilously close to exhausting the stack.
  *
  * To avoid this, we deliberately prevent gcc from inlining this
- * routine. Another way to avoid this is to use less agressive
+ * routine. Another way to avoid this is to use less aggressive
  * optimization when compiling this file (i.e. -O instead of -O2)
  * but special-casing the compilation of this one module in the
  * build system would be awkward.
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 47d92144ed9..4991c3f18bd 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -2001,10 +2001,10 @@ ieee80211_beacon_update(struct ieee80211com *ic, struct ieee80211_node *ni,
 		struct ieee80211_wme_state *wme = &ic->ic_wme;
 
 		/*
-		 * Check for agressive mode change.  When there is
+		 * Check for aggressive mode change.  When there is
 		 * significant high priority traffic in the BSS
 		 * throttle back BE traffic by using conservative
-		 * parameters.  Otherwise BE uses agressive params
+		 * parameters.  Otherwise BE uses aggressive params
 		 * to optimize performance of legacy/non-QoS traffic.
 		 */
 		if (wme->wme_flags & WME_F_AGGRMODE) {
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 871aa8e1ece..cbb6c18b42c 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -143,7 +143,7 @@ ieee80211_proto_detach(struct ieee80211com *ic)
 {
 
 	/*
-	 * This should not be needed as we detach when reseting
+	 * This should not be needed as we detach when resetting
 	 * the state but be conservative here since the
 	 * authenticator may do things like spawn kernel threads.
 	 */
@@ -711,7 +711,7 @@ ieee80211_wme_initparams(struct ieee80211com *ic)
 	/* NB: check ic_bss to avoid NULL deref on initial attach */
 	if (ic->ic_bss != NULL) {
 		/*
-		 * Calculate agressive mode switching threshold based
+		 * Calculate aggressive mode switching threshold based
 		 * on beacon interval.  This doesn't need locking since
 		 * we're only called before entering the RUN state at
 		 * which point we start sending beacon frames.
@@ -760,11 +760,11 @@ ieee80211_wme_updateparams_locked(struct ieee80211com *ic)
 	}
 
 	/*
-	 * This implements agressive mode as found in certain
+	 * This implements aggressive mode as found in certain
 	 * vendors' AP's.  When there is significant high
 	 * priority (VI/VO) traffic in the BSS throttle back BE
 	 * traffic by using conservative parameters.  Otherwise
-	 * BE uses agressive params to optimize performance of
+	 * BE uses aggressive params to optimize performance of
 	 * legacy/non-QoS traffic.
 	 */
         if ((ic->ic_opmode == IEEE80211_M_HOSTAP &&
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index fc8c2299766..92f4c3259d8 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.h
@@ -210,10 +210,10 @@ struct chanAccParams {
 
 struct ieee80211_wme_state {
 	u_int	wme_flags;
-#define	WME_F_AGGRMODE	0x00000001	/* STATUS: WME agressive mode */
+#define	WME_F_AGGRMODE	0x00000001	/* STATUS: WME aggressive mode */
 	u_int	wme_hipri_traffic;	/* VI/VO frames in beacon interval */
-	u_int	wme_hipri_switch_thresh;/* agressive mode switch thresh */
-	u_int	wme_hipri_switch_hysteresis;/* agressive mode switch hysteresis */
+	u_int	wme_hipri_switch_thresh;/* aggressive mode switch thresh */
+	u_int	wme_hipri_switch_hysteresis;/* aggressive mode switch hysteresis */
 
 	struct wmeParams wme_params[4];		/* from assoc resp for each AC*/
 	struct chanAccParams wme_wmeChanParams;	/* WME params applied to self */
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 5910977180c..7b9692fed77 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -2187,7 +2187,7 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
 #endif
 		/*
 		 * If source address selection fails and we find no route then
-		 * the ip_ouput should fail as well with a NO_ROUTE_TO_HOST
+		 * the ip_output should fail as well with a NO_ROUTE_TO_HOST
 		 * type error. We probably should catch that somewhere and
 		 * abort the association right away (assuming this is an INIT
 		 * being sent).
@@ -8166,7 +8166,7 @@ static struct sctp_nets *
 sctp_select_hb_destination(struct sctp_tcb *stcb, struct timeval *now)
 {
 	struct sctp_nets *net, *hnet;
-	int ms_goneby, highest_ms, state_overide=0;
+	int ms_goneby, highest_ms, state_override=0;
 
 	SCTP_GETTIME_TIMEVAL(now);
 	highest_ms = 0;
@@ -8212,12 +8212,12 @@ sctp_select_hb_destination(struct sctp_tcb *stcb, struct timeval *now)
 		 * state, thenw we cut it back to HB at a more normal pace.
 		 */
 		if ((net->dest_state & (SCTP_ADDR_UNCONFIRMED|SCTP_ADDR_NOT_REACHABLE)) == SCTP_ADDR_UNCONFIRMED) {
-			state_overide = 1;
+			state_override = 1;
 		} else {
-			state_overide = 0;
+			state_override = 0;
 		}
 
-		if ((((unsigned int)ms_goneby >= net->RTO) || (state_overide)) &&
+		if ((((unsigned int)ms_goneby >= net->RTO) || (state_override)) &&
 		    (ms_goneby > highest_ms)) {
 			highest_ms = ms_goneby;
 			hnet = net;
@@ -8231,12 +8231,12 @@ sctp_select_hb_destination(struct sctp_tcb *stcb, struct timeval *now)
 	}
 	if (hnet &&
 	   ((hnet->dest_state & (SCTP_ADDR_UNCONFIRMED|SCTP_ADDR_NOT_REACHABLE)) == SCTP_ADDR_UNCONFIRMED)) {
-		state_overide = 1;
+		state_override = 1;
 	} else {
-		state_overide = 0;
+		state_override = 0;
 	}
 
-	if (highest_ms && (((unsigned int)highest_ms >= hnet->RTO) || state_overide)) {
+	if (highest_ms && (((unsigned int)highest_ms >= hnet->RTO) || state_override)) {
 		/* Found the one with longest delay bounds
 		 * OR it is unconfirmed and still not marked
 		 * unreachable.
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 1e8b475712b..bc408d26261 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -1268,7 +1268,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	case SCTP_TIMER_TYPE_INPKILL:
 		/*
 		 * The inp is setup to die. We re-use the
-		 * signature_chage timer since that has
+		 * signature_change timer since that has
 		 * stopped and we are in the GONE state.
 		 */
 		tmr = &inp->sctp_ep.signature_change;
@@ -1456,7 +1456,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	case SCTP_TIMER_TYPE_INPKILL:
 		/*
 		 * The inp is setup to die. We re-use the
-		 * signature_chage timer since that has
+		 * signature_change timer since that has
 		 * stopped and we are in the GONE state.
 		 */
 		tmr = &inp->sctp_ep.signature_change;
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 100a44c3f88..bfd050ad9d7 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -87,7 +87,7 @@
 /*
  * Disk information dictionary.
  *
- * This contains general infomation for disk devices.
+ * This contains general information for disk devices.
  *
  *	<dict>
  *		<key>type</key>
diff --git a/usr.bin/config/TODO b/usr.bin/config/TODO
index 32bad7dde7a..be5ca12f597 100644
--- a/usr.bin/config/TODO
+++ b/usr.bin/config/TODO
@@ -74,7 +74,7 @@ o Retire "attach foo at bar with foo_bar.c"
   are typical examples.  For ehci(4), EHCI-capable controller drivers implement
   "ehcibus" interface, like:
 
-	defne	ehcibus {}
+	define	ehcibus {}
 	device	imxehci: ehcibus
 
   These drivers' attach functions call config_found() to attach ehci(4) via
@@ -319,7 +319,7 @@ o Clean up linker scripts.
   o Remove .rel/.rela handlings.
 
     These are set in relocatable objects, and handled by dynamic linkers.
-    Totally irrelefant for kernels.
+    Totally irrelevant for kernels.
 
   o Clean up debug section handlings.
 
@@ -392,7 +392,7 @@ o Don't use -Ttext ${TEXTADDR}.
   Although ld(1)'s `-Ttext ${TEXTADDR}' is an easy way to specify the virtual
   base address of .text at link time, it needs to change command-line; in
   kernel build, Makefile needs to change to reflect kernel's configuration.
-  It is simpler to reflect kenel configuration using linker script via assym.h.
+  It is simpler to reflect kernel configuration using linker script via assym.h.
 
 o Convert ${DIAGNOSTIC} and ${DEBUG} as flags (defflag).
 
@@ -402,7 +402,7 @@ o Convert ${DIAGNOSTIC} and ${DEBUG} as flags (defflag).
 o Strictly define DIAGNOSTIC.
 
   It is possible to make DIAGNOSTIC kernel and modules binary-compatible with
-  non-DIAGNOSTIC ones.  In that case, debug type informations should match
+  non-DIAGNOSTIC ones.  In that case, debug type information should match
   theoretically (not confirmed).
 
 o Use suffix rules.
@@ -418,7 +418,7 @@ o Use suffix rules.
   DIAGNOSTIC/DEBUG.
 
   genassym(1) definitions will be split into per-source instead of the single
-  assym.h.  Dependencies are corrected and some of misterious dependencies on
+  assym.h.  Dependencies are corrected and some of mysterious dependencies on
   `Makefile' in sys/conf/Makefile.kern.inc can go away.
 
 o Define genassym(1) symbols per file.
@@ -448,7 +448,7 @@ o Clean up ${MD_OBJS} and friends in Makefile.${MACHINE}.
 
   Don't use ${MD_OBJS}, ${MD_LIBS}, ${MD_SFILES}, and ${MD_CFILES}.
 
-  List files in config(5)'s "file".  Override build rules only when neccesary.
+  List files in config(5)'s "file".  Override build rules only when necessary.
 
   Rely on the fact that config(1) parses files.${MACHINE} first, outputs
   files in the order it parses files.* (actually include depth), and
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index a0e9008e98f..1260aeebcc8 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -221,7 +221,7 @@ vensync(int fd)
 	(void)ioctl(FD, TIOCSDTR, 0);
 	while (already < MAXRETRY) {
 		/*
-		 * After reseting the modem, send it two \r's to
+		 * After resetting the modem, send it two \r's to
 		 * autobaud on. Make sure to delay between them
 		 * so the modem can frame the incoming characters.
 		 */
diff --git a/usr.sbin/altq/altqstat/altqstat.c b/usr.sbin/altq/altqstat/altqstat.c
index 8f5851f7964..4793f454556 100644
--- a/usr.sbin/altq/altqstat/altqstat.c
+++ b/usr.sbin/altq/altqstat/altqstat.c
@@ -227,7 +227,7 @@ char *
 rate2str(double rate)
 {
 	char *buf;
-	static char r2sbuf[R2S_BUFS][RATESTR_MAX];  /* ring bufer */
+	static char r2sbuf[R2S_BUFS][RATESTR_MAX];  /* ring buffer */
 	static int idx = 0;
 
 	buf = r2sbuf[idx++];
diff --git a/usr.sbin/ypserv/yppush/yppush.c b/usr.sbin/ypserv/yppush/yppush.c
index cf0f18a0295..451b84df7f3 100644
--- a/usr.sbin/ypserv/yppush/yppush.c
+++ b/usr.sbin/ypserv/yppush/yppush.c
@@ -153,7 +153,7 @@ main(int argc, char *argv[])
 			    yperr_string(c));
 	}
 	/*
-         * verify that the domain and specified database exsists
+         * verify that the domain and specified database exists
          *
          * XXXCDC: this effectively prevents us from pushing from any
          * host but the master.   an alternate plan is to find the master



Home | Main Index | Thread Index | Old Index