diff --git a/lib/checkvers b/lib/checkvers
index ebf27ff30547..76ae1cc41eed 100755
--- a/lib/checkvers
+++ b/lib/checkvers
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$NetBSD: checkvers,v 1.7 2008/04/30 13:10:50 martin Exp $
+#	$NetBSD: checkvers,v 1.8 2021/12/03 13:27:37 andvar Exp $
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # checkvers [-q] [systemlibdir [library name]]
 #
 # This is a wrapper script around checkver.  It will find
-# all directories withing the current directory containing
+# all directories within the current directory containing
 # a shlib_version file and call checkver for each.
 #
 # As with checkver, a list of directories of installed libraries
@@ -44,7 +44,7 @@
 # will not work correctly if it finds shlib_version files
 # corresponding to a different library.
 #
-# This script produces no output if all library version are ok.
+# This script produces no output if all library versions are ok.
 # If the versions aren't ok the header will be displayed once
 # followed by a list of problematic libraries.
 #
diff --git a/lib/libcurses/PSD.doc/Makefile b/lib/libcurses/PSD.doc/Makefile
index 256b6c291429..73246602ea64 100644
--- a/lib/libcurses/PSD.doc/Makefile
+++ b/lib/libcurses/PSD.doc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2014/07/15 13:27:58 christos Exp $
+#	$NetBSD: Makefile,v 1.15 2021/12/03 13:27:38 andvar Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 5/23/94
 
 SECTION=reference/ref3
@@ -16,7 +16,7 @@ CLEANFILES+= ${CEXAMPLES} intro.2.tbl
 
 #
 # this section formats C input source into nice troffable (or nroffable)
-# versions.  It uses the capabilites of "vgrind", which sets keywords in
+# versions.  It uses the capabilities of "vgrind", which sets keywords in
 # bold font, and comments in italics.
 #
 
diff --git a/sbin/iscsictl/iscsic_parse.c b/sbin/iscsictl/iscsic_parse.c
index 51052ad11fa3..8a6f21310e82 100644
--- a/sbin/iscsictl/iscsic_parse.c
+++ b/sbin/iscsictl/iscsic_parse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsic_parse.c,v 1.3 2015/05/30 15:57:32 joerg Exp $	*/
+/*	$NetBSD: iscsic_parse.c,v 1.4 2021/12/03 13:27:38 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -204,7 +204,7 @@ cl_get_target(iscsid_add_target_req_t ** ptarg, int argc, char **argv, int nreq)
 	size_t num, len, name;
 	int i, p;
 
-	/* count number of addreses first, so we know how much memory to allocate */
+	/* count number of addresses first, so we know how much memory to allocate */
 	for (i = (int)(num = name = 0); i < argc; i++) {
 		if (!argv[i] || argv[i][0] != '-')
 			continue;
diff --git a/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c b/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
index 5327d9f66da0..dcab9eeb125e 100644
--- a/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
+++ b/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.12 2021/08/10 06:47:48 skrll Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.13 2021/12/03 13:27:38 andvar Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -320,7 +320,7 @@ power_vddio_from_dcdc(int target, int brownout)
 {
         uint32_t tmp_r;
 
-        /* BO_OFFSET must be withing 2700mV - 3475mV */
+        /* BO_OFFSET must be within 2700mV - 3475mV */
         if (brownout > 3475)
                 brownout = 3475;
         else if (brownout < 2700)
diff --git a/sys/arch/sgimips/hpc/pi1ppc.c b/sys/arch/sgimips/hpc/pi1ppc.c
index 35d2c5c7207d..515f2cac42b1 100644
--- a/sys/arch/sgimips/hpc/pi1ppc.c
+++ b/sys/arch/sgimips/hpc/pi1ppc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pi1ppc.c,v 1.15 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: pi1ppc.c,v 1.16 2021/12/03 13:27:38 andvar Exp $ */
 
 /*
  * Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.15 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.16 2021/12/03 13:27:38 andvar Exp $");
 
 #include "opt_pi1ppc.h"
 
@@ -235,7 +235,7 @@ pi1ppc_sc_attach(struct pi1ppc_softc *lsc)
 
 	/* Set up parport_adapter structure */
 
-	/* Set capabilites */
+	/* Set capabilities */
 	sc_parport_adapter.capabilities = 0;
 	if (lsc->sc_has & PI1PPC_HAS_INTR) {
 		sc_parport_adapter.capabilities |= PPBUS_HAS_INTR;
diff --git a/sys/arch/sgimips/hpc/pi1ppcvar.h b/sys/arch/sgimips/hpc/pi1ppcvar.h
index 79e06e3bdb2d..9ceae8fa9f45 100644
--- a/sys/arch/sgimips/hpc/pi1ppcvar.h
+++ b/sys/arch/sgimips/hpc/pi1ppcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pi1ppcvar.h,v 1.6 2011/07/01 18:53:47 dyoung Exp $ */
+/* $NetBSD: pi1ppcvar.h,v 1.7 2021/12/03 13:27:38 andvar Exp $ */
 
 /*-
  * Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -43,7 +43,7 @@
 /* Maximum time to wait for device response */
 #define MAXBUSYWAIT	(5 * (hz))
 
-/* Poll interval when wating for device to become ready */
+/* Poll interval when waiting for device to become ready */
 #define PI1PPC_POLL	((hz)/10)
 
 /* Diagnostic and verbose printing macros */
diff --git a/sys/compat/linux/arch/powerpc/linux_machdep.h b/sys/compat/linux/arch/powerpc/linux_machdep.h
index a11f93f3bafa..87e87030fd1f 100644
--- a/sys/compat/linux/arch/powerpc/linux_machdep.h
+++ b/sys/compat/linux/arch/powerpc/linux_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.h,v 1.10 2008/11/12 12:36:10 ad Exp $ */
+/*	$NetBSD: linux_machdep.h,v 1.11 2021/12/03 13:27:38 andvar Exp $ */
 
 /*-
  * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@ typedef linux_elf_greg_t linux_elf_gregset_t[LINUX_ELF_NGREG];
  * defines a rt_sigframe struct, but it is only used for RT signals. for
  * non RT signals, struct sigregs is used instead.
  *
- * About the ltramp filed: that trampoline code is not used. Instead, the
+ * About the ltramp field: that trampoline code is not used. Instead, the
  * sigcode (7 bytes long) trampoline code, copied by exec() on program startup
  * is used. However, Linux binaries might expect it to be here.
  */
diff --git a/sys/dev/ic/README.ncr5380sbc b/sys/dev/ic/README.ncr5380sbc
index 01ea4cc0f0df..27cf82fddcfc 100644
--- a/sys/dev/ic/README.ncr5380sbc
+++ b/sys/dev/ic/README.ncr5380sbc
@@ -136,7 +136,7 @@ drive, then invest in an Adaptec 154X or a PCI controller.
 
 2) No support for the SCSI port of the Pro AudioStudio 16.
 
-This is also unfortunate and may not be able to be remedied withing the
+This is also unfortunate and may not be able to be remedied within the
 current framework of the bus_space() functions and the nca driver.
 
 The problem is this: In most adapters, the eight 53C80 registers are mapped
diff --git a/sys/dev/ic/atppc.c b/sys/dev/ic/atppc.c
index fdf12bea67be..6ac27b391032 100644
--- a/sys/dev/ic/atppc.c
+++ b/sys/dev/ic/atppc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc.c,v 1.39 2021/08/07 16:19:12 thorpej Exp $ */
+/* $NetBSD: atppc.c,v 1.40 2021/12/03 13:27:38 andvar Exp $ */
 
 /*
  * Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.39 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.40 2021/12/03 13:27:38 andvar Exp $");
 
 #include "opt_atppc.h"
 
@@ -185,7 +185,7 @@ atppc_sc_attach(struct atppc_softc *lsc)
 
 	/* Set up parport_adapter structure */
 
-	/* Set capabilites */
+	/* Set capabilities */
 	sc_parport_adapter.capabilities = 0;
 	if (lsc->sc_has & ATPPC_HAS_INTR) {
 		sc_parport_adapter.capabilities |= PPBUS_HAS_INTR;
diff --git a/sys/dev/isa/atppc_isa.c b/sys/dev/isa/atppc_isa.c
index 898ebb5da44b..541c5eb1515b 100644
--- a/sys/dev/isa/atppc_isa.c
+++ b/sys/dev/isa/atppc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isa.c,v 1.15 2011/05/26 02:29:23 jakllsch Exp $ */
+/* $NetBSD: atppc_isa.c,v 1.16 2021/12/03 13:27:38 andvar Exp $ */
 
 /*-
  * Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.15 2011/05/26 02:29:23 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.16 2021/12/03 13:27:38 andvar Exp $");
 
 #include "opt_atppc.h"
 
@@ -53,10 +53,10 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.15 2011/05/26 02:29:23 jakllsch Exp
 
 /*
  * ISA bus attach code for atppc driver.
- * Note on capabilities: capabilites may exist in the chipset but may not
+ * Note on capabilities: capabilities may exist in the chipset but may not
  * necessarily be useable. I.e. you may specify an IRQ in the autoconfig, but
  * will the port actually have an IRQ assigned to it at the hardware level?
- * How can you test if the capabilites can be used? For interrupts, see if a
+ * How can you test if the capabilities can be used? For interrupts, see if a
  * handler exists (sc_intr != NULL). For DMA, see if the sc_dma_start() and
  * sc_dma_finish() function pointers are not NULL.
  */
diff --git a/sys/dev/pci/hifn7751var.h b/sys/dev/pci/hifn7751var.h
index c7c471887484..8c3bdc8b758c 100644
--- a/sys/dev/pci/hifn7751var.h
+++ b/sys/dev/pci/hifn7751var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hifn7751var.h,v 1.17 2020/05/17 00:54:05 riastradh Exp $	*/
+/*	$NetBSD: hifn7751var.h,v 1.18 2021/12/03 13:27:38 andvar Exp $	*/
 /*	$OpenBSD: hifn7751var.h,v 1.54 2020/01/11 21:34:04 cheloha Exp $	*/
 
 /*
@@ -166,7 +166,7 @@ struct hifn_softc {
 	int			sc_d_busy;	/* destination data ring busy */
 	int			sc_r_busy;	/* result ring busy */
 	int			sc_active;	/* for initial countdown */
-	int			sc_needwakeup;	/* ops q'd wating on resources */
+	int			sc_needwakeup;	/* ops q'd waiting on resources */
 	uint8_t			sc_sessions[2048/NBBY];
 	pci_chipset_tag_t sc_pci_pc;
 	pcitag_t sc_pci_tag;
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index f77bc1922805..60e9cf56ff6f 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.232 2021/10/10 23:28:36 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.233 2021/12/03 13:27:38 andvar Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.232 2021/10/10 23:28:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.233 2021/12/03 13:27:38 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -3899,7 +3899,7 @@ pci_conf_print_sec_pcie_cap(const pcireg_t *regs, int extcapoff)
 		reg = regs[o2i(pcie_capoff + PCIE_LCAP)];
 		maxlinkwidth = PCIREG_SHIFTOUT(reg, PCIE_LCAP_MAX_WIDTH);
 	} else {
-		printf("error: falied to get PCIe capablity\n");
+		printf("error: failed to get PCIe capability\n");
 		return;
 	}
 	for (i = 0; i < maxlinkwidth; i++) {
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index 6dcdb8454251..296857cf1892 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: synaptics.c,v 1.73 2021/10/21 04:49:28 blymn Exp $	*/
+/*	$NetBSD: synaptics.c,v 1.74 2021/12/03 13:27:39 andvar Exp $	*/
 
 /*
  * Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
 #include "opt_pms.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.73 2021/10/21 04:49:28 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.74 2021/12/03 13:27:39 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -413,7 +413,7 @@ pms_synaptics_probe_init(void *vsc)
 	/* Query the hardware capabilities. */
 	res = synaptics_special_read(psc, SYNAPTICS_READ_CAPABILITIES, resp);
 	if (res) {
-		/* Hmm, failed to get capabilites. */
+		/* Hmm, failed to get capabilities. */
 		aprint_error_dev(psc->sc_dev,
 		    "synaptics_probe: Failed to query capabilities.\n");
 		goto doreset;
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index e9f6b0b5b98d..e302b850c0c4 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gre.h,v 1.49 2021/02/14 19:33:29 roy Exp $ */
+/*	$NetBSD: if_gre.h,v 1.50 2021/12/03 13:27:39 andvar Exp $ */
 
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ struct gre_h {
 				and payload
 				Present if (ck_pres | rt_pres == 1).
 				Valid if (ck_pres == 1).
-	u_int_16 offset		offset from start of routing filed to
+	u_int_16 offset		offset from start of routing field to
 				first octet of active SRE (see below).
 				Present if (ck_pres | rt_pres == 1).
 				Valid if (rt_pres == 1).
@@ -127,7 +127,7 @@ struct gre_h {
 				Present if (key_pres ==1 ).
 	u_int_32 seq_num	Sequence number to allow for packet order
 				Present if (seq_pres ==1 ).
-	struct gre_sre[] routing Routing fileds (see below)
+	struct gre_sre[] routing Routing fields (see below)
 				Present if (rt_pres == 1)
  */
 };
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 4ea2c6cf8c81..5e685f730b1f 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.271 2020/03/13 06:55:35 knakahara Exp $	*/
+/*	$NetBSD: key.c,v 1.272 2021/12/03 13:27:39 andvar Exp $	*/
 /*	$FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.271 2020/03/13 06:55:35 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.272 2021/12/03 13:27:39 andvar Exp $");
 
 /*
  * This code is referred to RFC 2367
@@ -4900,7 +4900,7 @@ key_timehandler_spd(void)
 		mutex_enter(&key_spd.lock);
 		/*
 		 * To avoid for sp->created to overtake "now" because of
-		 * wating mutex, set time_uptime here.
+		 * waiting mutex, set time_uptime here.
 		 */
 		now = time_uptime;
 		SPLIST_WRITER_FOREACH(sp, dir) {
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index ad40dd1ce47b..809a9b11fb84 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cap_mkdb.c,v 1.29 2013/03/26 20:58:35 christos Exp $	*/
+/*	$NetBSD: cap_mkdb.c,v 1.30 2021/12/03 13:27:39 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\
 #if 0
 static char sccsid[] = "@(#)cap_mkdb.c	8.2 (Berkeley) 4/27/95";
 #endif
-__RCSID("$NetBSD: cap_mkdb.c,v 1.29 2013/03/26 20:58:35 christos Exp $");
+__RCSID("$NetBSD: cap_mkdb.c,v 1.30 2021/12/03 13:27:39 andvar Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -168,7 +168,7 @@ dounlink(void)
 #define SHADOW	(char)2
 
 /*
- * Db_build() builds the name and capabilty databases according to the
+ * Db_build() builds the name and capability databases according to the
  * details above.
  */
 static void
diff --git a/usr.bin/rump_dhcpclient/net.c b/usr.bin/rump_dhcpclient/net.c
index 424b7eaf4b34..5e2b67684d0c 100644
--- a/usr.bin/rump_dhcpclient/net.c
+++ b/usr.bin/rump_dhcpclient/net.c
@@ -166,7 +166,7 @@ hwaddr_aton(unsigned char *buffer, const char *addr)
 			errno = EINVAL;
 			return 0;
 		}
-		/* Ensure that next data is EOL or a seperator with data */
+		/* Ensure that next data is EOL or a separator with data */
 		if (!(*p == '\0' || (*p == ':' && *(p + 1) != '\0'))) {
 			errno = EINVAL;
 			return 0;
diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index 23dc27636e99..1b1a53b4a8a4 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: lp.local.h,v 1.8 2003/08/07 11:25:25 agc Exp $	*/
+/*	$NetBSD: lp.local.h,v 1.9 2021/12/03 13:27:40 andvar Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -67,7 +67,7 @@
 #define DROP	3		/* offset to drop characters with descenders */
 
 /*
- * Define TERMCAP if the terminal capabilites are to be used for lpq.
+ * Define TERMCAP if the terminal capabilities are to be used for lpq.
  */
 #define TERMCAP