diff --git a/common/lib/libc/gen/ptree.c b/common/lib/libc/gen/ptree.c
index da1895500329..15b407afa7c5 100644
--- a/common/lib/libc/gen/ptree.c
+++ b/common/lib/libc/gen/ptree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptree.c,v 1.10 2012/10/06 22:15:09 matt Exp $	*/
+/*	$NetBSD: ptree.c,v 1.11 2022/05/24 20:50:17 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <lib/libkern/libkern.h>
-__KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.10 2012/10/06 22:15:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.11 2022/05/24 20:50:17 andvar Exp $");
 #else
 #include <stddef.h>
 #include <stdint.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.10 2012/10/06 22:15:09 matt Exp $");
 #else
 #define	KASSERT(e)	do { } while (/*CONSTCOND*/ 0)
 #endif
-__RCSID("$NetBSD: ptree.c,v 1.10 2012/10/06 22:15:09 matt Exp $");
+__RCSID("$NetBSD: ptree.c,v 1.11 2022/05/24 20:50:17 andvar Exp $");
 #endif /* _KERNEL || _STANDALONE */
 
 #ifdef _LIBC
@@ -582,7 +582,7 @@ ptree_insert_node_common(pt_tree_t *pt, void *item)
 		KASSERT(id.id_bitoff >= branch_bitoff);
 
 		/*
-		 * Decend the tree one level.
+		 * Descend the tree one level.
 		 */
 		id.id_parent = ptn;
 		id.id_parent_slot = ptree_testnode(pt, target, id.id_parent);
@@ -1011,7 +1011,7 @@ ptree_remove_node(pt_tree_t *pt, void *item)
 		/*
 		 * Now we are the normal removal case.  Since after the
 		 * target's leaf identity is removed from the its parent,
-		 * that parent will only have one decendent.  So we can
+		 * that parent will only have one descendant.  So we can
 		 * just as easily replace the node that has the parent's
 		 * branch identity with the surviving node.  This freeing
 		 * parent from its branching duties which means it can
diff --git a/common/lib/libc/gen/radixtree.c b/common/lib/libc/gen/radixtree.c
index fc3ec78471ac..dd391e6a9c0b 100644
--- a/common/lib/libc/gen/radixtree.c
+++ b/common/lib/libc/gen/radixtree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $	*/
+/*	$NetBSD: radixtree.c,v 1.28 2022/05/24 20:50:17 andvar Exp $	*/
 
 /*-
  * Copyright (c)2011,2012,2013 YAMAMOTO Takashi,
@@ -112,7 +112,7 @@
 #include <sys/cdefs.h>
 
 #if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.28 2022/05/24 20:50:17 andvar Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
@@ -122,7 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $
 #include <lib/libsa/stand.h>
 #endif /* defined(_STANDALONE) */
 #else /* defined(_KERNEL) || defined(_STANDALONE) */
-__RCSID("$NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $");
+__RCSID("$NetBSD: radixtree.c,v 1.28 2022/05/24 20:50:17 andvar Exp $");
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -911,7 +911,7 @@ scan_siblings:
 descend:
 		/*
 		 * following the left-most (or right-most in the case of
-		 * reverse scan) child node, decend until reaching the leaf or
+		 * reverse scan) child node, descend until reaching the leaf or
 		 * an non-matching entry.
 		 */
 		while (entry_match_p(*vpp, tagmask) && lastidx < t->t_height) {
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
index 740da200e7e6..6b0229c388b6 100644
--- a/lib/libc/stdlib/div.3
+++ b/lib/libc/stdlib/div.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: div.3,v 1.15 2016/12/17 06:17:16 abhinav Exp $
+.\"	$NetBSD: div.3,v 1.16 2022/05/24 20:50:17 andvar Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,7 +56,7 @@
 .Sh DESCRIPTION
 These functions compute the value of
 .Fa num / denom
-and return the quotient and remainder in a specific divison structure.
+and return the quotient and remainder in a specific division structure.
 The functions differ only with respect to the type of the return value and
 the parameters.
 .Pp
diff --git a/lib/libp2k/p2k.c b/lib/libp2k/p2k.c
index 76293dce0d01..e0acac3ec403 100644
--- a/lib/libp2k/p2k.c
+++ b/lib/libp2k/p2k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: p2k.c,v 1.74 2022/04/19 20:32:17 rillig Exp $	*/
+/*	$NetBSD: p2k.c,v 1.75 2022/05/24 20:50:17 andvar Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -361,7 +361,7 @@ p2k_init(uint32_t puffs_flags)
 	}
 
 	/*
-	 * Explicitely tell that our cookies can be treated as
+	 * Explicitly tell that our cookies can be treated as
 	 * puffs_node, since we never let libpuffs know by 
 	 * calling  call puffs_pn_new()
 	 */
diff --git a/sbin/iscsid/iscsid_targets.c b/sbin/iscsid/iscsid_targets.c
index 73c88100156f..24dba0ea00ac 100644
--- a/sbin/iscsid/iscsid_targets.c
+++ b/sbin/iscsid/iscsid_targets.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsid_targets.c,v 1.6 2016/05/29 13:35:45 mlelstv Exp $	*/
+/*	$NetBSD: iscsid_targets.c,v 1.7 2022/05/24 20:50:17 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -973,7 +973,7 @@ refresh_targets(iscsid_refresh_req_t * par)
 	case TARGET_LIST:
 		/*
 		 * Refreshing for a specific target makes no sense if it's
-		 * static. Maybe implement it for dynamically dicovered
+		 * static. Maybe implement it for dynamically discovered
 		 * targets? But then it's best done through the discovering
 		 * instance, or we'll refresh much more than just the given
 		 * target. And refreshing the whole list is iffy as well. So
diff --git a/sbin/mount_nilfs/mount_nilfs.8 b/sbin/mount_nilfs/mount_nilfs.8
index d37aa11dbda8..a8261590536d 100644
--- a/sbin/mount_nilfs/mount_nilfs.8
+++ b/sbin/mount_nilfs/mount_nilfs.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_nilfs.8,v 1.5 2019/10/16 21:52:22 maya Exp $
+.\" $NetBSD: mount_nilfs.8,v 1.6 2022/05/24 20:50:17 andvar Exp $
 .\"
 .\" Copyright (c) 2008, 2009 Reinoud Zandijk
 .\" All rights reserved.
@@ -76,7 +76,7 @@ If not set, the user's current time zone will be used.
 .Xr umount 8 ,
 .Xr vnconfig 8
 .Sh HISTORY
-NILFS is a file system developped by NTT and released in 2005 for
+NILFS is a file system developed by NTT and released in 2005 for
 Linux.
 Version 2 is available since 2009.
 This cleanroom implementation was written by
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index f245a22aee01..f6069a57697b 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lagg.4,v 1.3 2021/06/29 10:26:00 wiz Exp $
+.\"	$NetBSD: lagg.4,v 1.4 2022/05/24 20:50:18 andvar Exp $
 .\"
 .\" Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
 .\"
@@ -119,9 +119,9 @@ available, the VLAN tag, and the IP source and destination address.
 .It Ic lacp
 Supports the IEEE 802.1AX (formerly 802.3ad) Link Aggregation Control Protocol
 (LACP) and the Marker Protocol.
-LACP will nagotiate a set of aggregable links wit the peer in to a Link
+LACP will negotiate a set of aggregable links wit the peer in to a Link
 Aggregated Group.
-The LAG is composed of ports of the diffrent speed, set to full-duplex operation,
+The LAG is composed of ports of the different speed, set to full-duplex operation,
 if
 .Ic lagglacp Nm multi-speed
 option is configured.
@@ -143,7 +143,7 @@ interface itself.
 .Pp
 Each
 .Nm
-interface is created at runtime using interface cloing.
+interface is created at runtime using interface cloning.
 This is
 most easily done with the
 .Xr ifconfig 8
diff --git a/sys/altq/altq_rmclass.h b/sys/altq/altq_rmclass.h
index faea9f3e9d91..260621a7222e 100644
--- a/sys/altq/altq_rmclass.h
+++ b/sys/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_rmclass.h,v 1.12 2021/07/21 06:47:33 ozaki-r Exp $	*/
+/*	$NetBSD: altq_rmclass.h,v 1.13 2022/05/24 20:50:18 andvar Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
 
 /*
@@ -168,7 +168,7 @@ struct rm_class {
  */
 struct rm_ifdat {
 	int		queued_;	/* # pkts queued downstream */
-	int		efficient_;	/* Link Efficency bit */
+	int		efficient_;	/* Link Efficiency bit */
 	int		wrr_;		/* Enable Weighted Round-Robin */
 	uint64_t	ps_per_byte_;	/* Link byte speed. */
 	int		maxqueued_;	/* Max packets to queue */
diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index 155dddabc15a..9d0d3af82219 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf.c,v 1.67 2021/08/07 16:18:41 thorpej Exp $ */
+/*	$NetBSD: grf.c,v 1.68 2022/05/24 20:50:18 andvar Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.67 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.68 2022/05/24 20:50:18 andvar Exp $");
 
 /*
  * Graphics display driver for the Amiga
@@ -163,7 +163,7 @@ grfmatch(device_t parent, cfdata_t cf, void *aux)
 /*
  * Attach.. plug pointer in and print some info.
  * Then try and attach a wsdisplay or ite to us.
- * Note: self is NULL durring console init.
+ * Note: self is NULL during console init.
  */
 void
 grfattach(device_t parent, device_t self, void *aux)
diff --git a/sys/arch/amiga/dev/if_es.c b/sys/arch/amiga/dev/if_es.c
index 0acbdcf89a6b..16ba78a13129 100644
--- a/sys/arch/amiga/dev/if_es.c
+++ b/sys/arch/amiga/dev/if_es.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.65 2020/01/29 05:23:16 thorpej Exp $ */
+/*	$NetBSD: if_es.c,v 1.66 2022/05/24 20:50:18 andvar Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.65 2020/01/29 05:23:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.66 2022/05/24 20:50:18 andvar Exp $");
 
 
 #include <sys/param.h>
@@ -764,7 +764,7 @@ esstart(struct ifnet *ifp)
 #ifdef ESDEBUG
 	if (sc->sc_smcbusy++) {
 		printf("%s: esstart re-entered\n", device_xname(sc->sc_dev));
-		panic("esstart re-entred");
+		panic("esstart re-entered");
 	}
 	while ((smc->b2.bsr & BSR_MASK) != BSR_BANK2) {
 		printf("%s: esstart BSR not 2: %04x\n", device_xname(sc->sc_dev),
diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c
index 0b01ada3f9a7..5ddcc695ba48 100644
--- a/sys/arch/arc/dev/pccons.c
+++ b/sys/arch/arc/dev/pccons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.c,v 1.62 2014/10/18 08:33:24 snj Exp $	*/
+/*	$NetBSD: pccons.c,v 1.63 2022/05/24 20:50:18 andvar Exp $	*/
 /*	$OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $	*/
 /*	NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp	*/
 
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.62 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.63 2022/05/24 20:50:18 andvar Exp $");
 
 #include "opt_ddb.h"
 
@@ -557,7 +557,7 @@ pccons_common_match(bus_space_tag_t crt_iot, bus_space_tag_t crt_memt,
 	 * is set to table 1; in fact, it would appear that some keyboards just
 	 * ignore the command altogether.  So by default, we use the AT scan
 	 * codes and have the 8042 translate them.  Unfortunately, this is
-	 * known to not work on some PS/2 machines.  We try desparately to deal
+	 * known to not work on some PS/2 machines.  We try desperately to deal
 	 * with this by checking the (lack of a) translate bit in the 8042 and
 	 * attempting to set the keyboard to XT mode.  If this all fails, well,
 	 * tough luck.
diff --git a/sys/arch/evbarm/conf/GUMSTIX b/sys/arch/evbarm/conf/GUMSTIX
index 51eaf1e43f6d..1c533aef763c 100644
--- a/sys/arch/evbarm/conf/GUMSTIX
+++ b/sys/arch/evbarm/conf/GUMSTIX
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.108 2021/01/20 01:20:26 nia Exp $
+#	$NetBSD: GUMSTIX,v 1.109 2022/05/24 20:50:18 andvar Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -206,7 +206,7 @@ gxio0	at pxaip?
 options 	GXIO_BLUETOOTH_ON_HWUART	# Bluetooth module on HWUART
 #options 	GXIO_DEFAULT_EXPANSION="\"netCF\""
 
-# gumstix expantion boards
+# gumstix expansion boards
 
 # SMC 91C111
 sm0	at gxio? addr 0x04000300 gpirq ?
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_start.S b/sys/arch/evbarm/ixm1200/ixm1200_start.S
index 77b209d32b32..11f78c2b701a 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_start.S
+++ b/sys/arch/evbarm/ixm1200/ixm1200_start.S
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_start.S,v 1.5 2013/12/02 18:36:11 joerg Exp $ */
+/* $NetBSD: ixm1200_start.S,v 1.6 2022/05/24 20:50:18 andvar Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 	.section .start,"ax",%progbits
 
-RCSID("$NetBSD: ixm1200_start.S,v 1.5 2013/12/02 18:36:11 joerg Exp $")
+RCSID("$NetBSD: ixm1200_start.S,v 1.6 2022/05/24 20:50:18 andvar Exp $")
 
 	.global _C_LABEL(ixm1200_start)
 _C_LABEL(ixm1200_start):
@@ -115,7 +115,7 @@ _C_LABEL(ixm1200_start):
 	 * talk to VA == PA during bootstrap.
 	 *
 	 * We also want to map the v0xf0000000 == p0x90000000
-	 * to output eary bootstrup messages to the console.
+	 * to output early bootstrup messages to the console.
 	 *
 	 * We just use section mappings for all of this to make it easy.
 	 *
diff --git a/sys/arch/mips/ralink/ralink_eth.c b/sys/arch/mips/ralink/ralink_eth.c
index 33d5988da99b..07c96337bd95 100644
--- a/sys/arch/mips/ralink/ralink_eth.c
+++ b/sys/arch/mips/ralink/ralink_eth.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ralink_eth.c,v 1.23 2022/03/16 10:08:02 andvar Exp $	*/
+/*	$NetBSD: ralink_eth.c,v 1.24 2022/05/24 20:50:18 andvar Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
 /* ralink_eth.c -- Ralink Ethernet Driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.23 2022/03/16 10:08:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.24 2022/05/24 20:50:18 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1332,7 +1332,7 @@ ralink_eth_watchdog(struct ifnet *ifp)
 
 	sc->sc_evcnt_wd_reactivate.ev_count++;
 	const int s = splnet();
-	/* deactive the active partitions, retaining the active information */
+	/* deactivate the active partitions, retaining the active information */
 	ralink_eth_disable(sc);
 	ralink_eth_enable(sc);
 	splx(s);
diff --git a/sys/arch/powerpc/include/booke/e500reg.h b/sys/arch/powerpc/include/booke/e500reg.h
index f6660d14ed81..4fd431b9d3de 100644
--- a/sys/arch/powerpc/include/booke/e500reg.h
+++ b/sys/arch/powerpc/include/booke/e500reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500reg.h,v 1.16 2014/12/27 17:58:21 nonaka Exp $	*/
+/*	$NetBSD: e500reg.h,v 1.17 2022/05/24 20:50:18 andvar Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -358,7 +358,7 @@
 #define	SPMODEn_CI	__PPCBIT(0)	/* Clock invert: 0=inactive state of SPI_CLK is low, 1=high */
 #define	SPMODEn_CP	__PPCBIT(1)	/* Clock phase: SPI_CLK starts toggling at the middle of the data transfer, 1=beginning */
 #define	SPMODEn_REV	__PPCBIT(2)	/* Reverse data mode: 0=LSB of the character sent and received first, 1=MSB */
-#define	SPMODEn_DIV16	__PPCBIT(3)	/* Devide by 16: 0=System clock, 1=System clock/16 */
+#define	SPMODEn_DIV16	__PPCBIT(3)	/* Divide by 16: 0=System clock, 1=System clock/16 */
 #define	SPMODEn_PM	__PPCBITS(4,7)	/* Prescale modulus select */
 #define	SPMODEn_ODD	__PPCBIT(8)	/* 0=Even division, 1=Odd dividion */
 #define	SPMODEn_POL	__PPCBIT(11)	/* CS polarity: 0=Asserted high/Negated low, 1=Asserted low/Negated high */
diff --git a/sys/arch/sparc/dev/kbd_pckbport.c b/sys/arch/sparc/dev/kbd_pckbport.c
index 91bfb8ef9d68..ffc96a8e8d11 100644
--- a/sys/arch/sparc/dev/kbd_pckbport.c
+++ b/sys/arch/sparc/dev/kbd_pckbport.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $ */
+/*	$NetBSD: kbd_pckbport.c,v 1.7 2022/05/24 20:50:18 andvar Exp $ */
 
 /*
  * Copyright (c) 2002 Valeriy E. Ushakov
@@ -90,7 +90,7 @@
  *	@(#)pccons.c	5.11 (Berkeley) 5/21/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.7 2022/05/24 20:50:18 andvar Exp $");
 
 /*
  * Serve JavaStation-1 PS/2 keyboard as a Type5 keyboard with US101A
@@ -261,7 +261,7 @@ kbd_pckbport_set_xtscancode(pckbport_tag_t kbctag, pckbport_slot_t kbcslot)
 	 * is set to table 1; in fact, it would appear that some keyboards just
 	 * ignore the command altogether.  So by default, we use the AT scan
 	 * codes and have the 8042 translate them.  Unfortunately, this is
-	 * known to not work on some PS/2 machines.  We try desparately to deal
+	 * known to not work on some PS/2 machines.  We try desperately to deal
 	 * with this by checking the (lack of a) translate bit in the 8042 and
 	 * attempting to set the keyboard to XT mode.  If this all fails, well,
 	 * tough luck.
diff --git a/sys/arch/sparc64/dev/ebus_mainbus.c b/sys/arch/sparc64/dev/ebus_mainbus.c
index 35d1b5d0ee26..1540dec1f793 100644
--- a/sys/arch/sparc64/dev/ebus_mainbus.c
+++ b/sys/arch/sparc64/dev/ebus_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebus_mainbus.c,v 1.22 2022/01/22 11:49:17 thorpej Exp $	*/
+/*	$NetBSD: ebus_mainbus.c,v 1.23 2022/05/24 20:50:19 andvar Exp $	*/
 /*	$OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.22 2022/01/22 11:49:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.23 2022/05/24 20:50:19 andvar Exp $");
 
 #ifdef DEBUG
 #define	EDB_PROM	0x01
@@ -141,7 +141,7 @@ ebus_mainbus_attach(device_t parent, device_t self, void *aux)
 	/*
 	 * Ebus interrupts may be connected to any of the PCI Express
 	 * leafs.  Here we add the appropriate IGN to the interrupt
-	 * mappings such that we can use it to distingish between
+	 * mappings such that we can use it to distinguish between
 	 * interrupts connected to PCIE-A and PCIE-B.
 	 */
 	for (i = 0; i < sc->sc_nintmap; i++) {
diff --git a/sys/dev/fdt/fdt_port.h b/sys/dev/fdt/fdt_port.h
index 129c1f6202ff..15a7df238b60 100644
--- a/sys/dev/fdt/fdt_port.h
+++ b/sys/dev/fdt/fdt_port.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdt_port.h,v 1.5 2022/04/10 09:50:45 andvar Exp $	*/
+/*	$NetBSD: fdt_port.h,v 1.6 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@ void * fdt_endpoint_get_data(struct fdt_endpoint *);
 int fdt_endpoint_activate(struct fdt_endpoint *, bool);
 
 /*
- * Activate/deactive an endpoint by direct reference.
+ * Activate/deactivate an endpoint by direct reference.
  */
 int fdt_endpoint_activate_direct(struct fdt_endpoint *, bool);
 
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 2dff66792cce..02ee47702866 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.78 2022/05/22 08:59:34 hannken Exp $ */
+/* $NetBSD: mfi.c,v 1.79 2022/05/24 20:50:19 andvar Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 
 /*
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.78 2022/05/22 08:59:34 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.79 2022/05/24 20:50:19 andvar Exp $");
 
 #include "bio.h"
 
@@ -1096,7 +1096,7 @@ mfi_attach(struct mfi_softc *sc, enum mfi_iop iop)
 
 		/*
 		 * Allocate DMA memory mapping for MPI2 IOC Init descriptor,
-		 * we are taking it diffrent from what we have allocated for
+		 * we are taking it different from what we have allocated for
 		 * Request and reply descriptors to avoid confusion later
 		 */
 		sc->sc_tbolt_ioc_init = mfi_allocmem(sc,
diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c
index 07e2b658cd51..b5b53f978583 100644
--- a/sys/dev/ic/rtl8169.c
+++ b/sys/dev/ic/rtl8169.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl8169.c,v 1.170 2022/01/27 18:07:27 jakllsch Exp $	*/
+/*	$NetBSD: rtl8169.c,v 1.171 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.170 2022/01/27 18:07:27 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.171 2022/05/24 20:50:19 andvar Exp $");
 /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
 
 /*
@@ -736,7 +736,7 @@ re_attach(struct rtk_softc *sc)
 	/*
 	 * RTL81x9 chips automatically read EEPROM to init MAC address,
 	 * and some NAS override its MAC address per own configuration,
-	 * so no need to explicitely read EEPROM and set ID registers.
+	 * so no need to explicitly read EEPROM and set ID registers.
 	 */
 #ifdef RE_USE_EECMD
 	if ((sc->sc_quirk & RTKQ_NOEECMD) != 0) {
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 0ef995fd4917..0394bf7446e6 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smc91cxx.c,v 1.106 2020/02/07 00:56:48 thorpej Exp $	*/
+/*	$NetBSD: smc91cxx.c,v 1.107 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -66,12 +66,12 @@
 /*
  * Core driver for the SMC 91Cxx family of Ethernet chips.
  *
- * Memory allocation interrupt logic is drived from an SMC 91C90 driver
+ * Memory allocation interrupt logic is derived from an SMC 91C90 driver
  * written for NetBSD/amiga by Michael Hitch.
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.106 2020/02/07 00:56:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.107 2022/05/24 20:50:19 andvar Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 0e2fd4f4fb83..23a31bf5cb96 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.308 2021/10/05 08:01:05 rin Exp $ */
+/*	$NetBSD: wdc.c,v 1.309 2022/05/24 20:50:19 andvar Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.308 2021/10/05 08:01:05 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.309 2022/05/24 20:50:19 andvar Exp $");
 
 #include "opt_ata.h"
 #include "opt_wdc.h"
@@ -997,7 +997,7 @@ wdc_reset_channel(struct ata_channel *chp, int flags)
 	/*
 	 * Look for pending xfers. If we have a shared queue, we'll also reset
 	 * the other channel if the current xfer is running on it.
-	 * Then we'll kill the eventual active transfer explicitely, so that
+	 * Then we'll kill the eventual active transfer explicitly, so that
 	 * it is queued for retry immediatelly without waiting for I/O timeout.
 	 */
 	if (xfer) {
diff --git a/sys/dev/ic/z8530reg.h b/sys/dev/ic/z8530reg.h
index 8aa13ad8b875..3b274ed6efeb 100644
--- a/sys/dev/ic/z8530reg.h
+++ b/sys/dev/ic/z8530reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: z8530reg.h,v 1.12 2005/12/11 12:21:29 christos Exp $ */
+/*	$NetBSD: z8530reg.h,v 1.13 2022/05/24 20:50:19 andvar Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -243,7 +243,7 @@
 
 /*
  * Bits in Write Register 7' (ZSWR_ENHANCED above). This register is
- * only available on the 85230. Dispite the fact it contains flags
+ * only available on the 85230. Despite the fact it contains flags
  * and not a single value, the register was named as it is read
  * via RR14. Weird.
  */
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index b13119d2889a..12de6938a6ae 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: irframe_tty.c,v 1.65 2021/09/26 01:16:09 thorpej Exp $	*/
+/*	$NetBSD: irframe_tty.c,v 1.66 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*
  * TODO
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.65 2021/09/26 01:16:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.66 2022/05/24 20:50:19 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -1138,7 +1138,7 @@ irts_litelink(struct tty *tp, u_int speed)
 /* Control register 1 */
 #define GIRBIL_TXEN      0x01 /* Enable transmitter */
 #define GIRBIL_RXEN      0x02 /* Enable receiver */
-#define GIRBIL_ECAN      0x04 /* Cancel self emmited data */
+#define GIRBIL_ECAN      0x04 /* Cancel self emitted data */
 #define GIRBIL_ECHO      0x08 /* Echo control characters */
 
 /* LED Current Register */
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index 6e792bdfad1a..f48ae9d93777 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: aicasm.c,v 1.12 2021/10/25 07:41:41 ryo Exp $	*/
+/*	$NetBSD: aicasm.c,v 1.13 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*
- * Aic7xxx SCSI host adapter firmware asssembler
+ * Aic7xxx SCSI host adapter firmware assembler
  *
  * Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.
  * Copyright (c) 2001, 2002 Adaptec Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: aicasm.c,v 1.12 2021/10/25 07:41:41 ryo Exp $");
+__RCSID("$NetBSD: aicasm.c,v 1.13 2022/05/24 20:50:19 andvar Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -179,7 +179,7 @@ main(int argc, char *argv[])
 			listfilename = optarg;
 			break;
 		case 'n':
-			/* Don't complain about the -nostdinc directrive */
+			/* Don't complain about the -nostdinc directive */
 			if (strcmp(optarg, "ostdinc")) {
 				fprintf(stderr, "%s: Unknown option -%c%s\n",
 					appname, ch, optarg);
@@ -258,7 +258,7 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	if (argc != 1) {
-		fprintf(stderr, "%s: No input file specifiled\n", appname);
+		fprintf(stderr, "%s: No input file specified\n", appname);
 		usage();
 		/* NOTREACHED */
 	}
@@ -285,9 +285,9 @@ main(int argc, char *argv[])
 		/* Process outmost scope */
 		process_scope(SLIST_FIRST(&scope_stack));
 		/*
-		 * Decend the tree of scopes and insert/emit
+		 * Descend the tree of scopes and insert/emit
 		 * patches as appropriate.  We perform a depth first
-		 * tranversal, recursively handling each scope.
+		 * transversal, recursively handling each scope.
 		 */
 		/* start at the root scope */
 		dump_scope(SLIST_FIRST(&scope_stack));
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
index 6e0dc05d69b7..5bf8d8123cc2 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: aicasm_symbol.c,v 1.8 2022/01/01 22:01:18 andvar Exp $	*/
+/*	$NetBSD: aicasm_symbol.c,v 1.9 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*
- * Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
+ * Aic7xxx SCSI host adapter firmware assembler symbol table implementation
  *
  * Copyright (c) 1997 Justin T. Gibbs.
  * Copyright (c) 2002 Adaptec Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: aicasm_symbol.c,v 1.8 2022/01/01 22:01:18 andvar Exp $");
+__RCSID("$NetBSD: aicasm_symbol.c,v 1.9 2022/05/24 20:50:19 andvar Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.h b/sys/dev/microcode/aic7xxx/aicasm_symbol.h
index f198bbfcb635..328ad9e7a7fe 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.h
@@ -1,7 +1,7 @@
-/*	$NetBSD: aicasm_symbol.h,v 1.3 2021/10/25 07:40:29 ryo Exp $	*/
+/*	$NetBSD: aicasm_symbol.h,v 1.4 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*
- * Aic7xxx SCSI host adapter firmware asssembler symbol table definitions
+ * Aic7xxx SCSI host adapter firmware assembler symbol table definitions
  *
  * Copyright (c) 1997 Justin T. Gibbs.
  * Copyright (c) 2002 Adaptec Inc.
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 694dd11a2c1b..36ea982fb939 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sip.c,v 1.185 2022/02/16 22:00:56 andvar Exp $	*/
+/*	$NetBSD: if_sip.c,v 1.186 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.185 2022/02/16 22:00:56 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.186 2022/05/24 20:50:19 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1737,7 +1737,7 @@ sipcom_start(struct ifnet *ifp)
 		 * chip's internal queue (indicated by TXE being clear),
 		 * then the driver software must set the TXDP to the
 		 * first descriptor to be transmitted.  However, if we
-		 * do this, it causes serious performance degredation on
+		 * do this, it causes serious performance degradation on
 		 * the DP83820 under load, not setting TXDP doesn't seem
 		 * to adversely affect the SiS 900 or DP83815.
 		 *
@@ -2745,7 +2745,7 @@ sipcom_init(struct ifnet *ifp)
 
 	/*
 	 * Checksum offloading is disabled if the user selects an MTU
-	 * larger than 8109.  (FreeBSD says 8152, but there is emperical
+	 * larger than 8109.  (FreeBSD says 8152, but there is empirical
 	 * evidence that >8109 does not work on some boards, such as the
 	 * Planex GN-1000TE).
 	 */
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 6c6b27d59165..f5fc236ce33a 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.166 2022/05/14 19:44:37 riastradh Exp $	*/
+/*	$NetBSD: xhci.c,v 1.167 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.166 2022/05/14 19:44:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.167 2022/05/24 20:50:19 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2448,7 +2448,7 @@ xhci_event_transfer(struct xhci_softc * const sc,
 		 * ux_actlen and ux_dmabuf will be passed to
 		 * usb_transfer_complete after the Status stage event.
 		 *
-		 * It can be distingished which stage generates the event:
+		 * It can be distinguished which stage generates the event:
 		 * + by checking least 3 bits of trb_0 if ED==1.
 		 *   (see xhci_device_ctrl_start).
 		 * + by checking the type of original TRB if ED==0.
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index c70082c9d6cc..e5fd684a9163 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.140 2022/02/12 15:51:29 thorpej Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.141 2022/05/24 20:50:19 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009, 2021 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 #endif /* _KERNEL_OPT */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.140 2022/02/12 15:51:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.141 2022/05/24 20:50:19 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -924,7 +924,7 @@ knote_proc_fork_track(struct proc *p1, struct proc *p2, struct knote *okn)
 	 * notification if the child exits before the tracking process
 	 * has received the NOTE_CHILD notification, which applications
 	 * aren't expecting (the event's 'data' field would be clobbered,
-	 * for exmaple).
+	 * for example).
 	 *
 	 * To do this, what we have here is an **extremely** stripped-down
 	 * version of kqueue_register() that has the following properties:
diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c
index 2062f86fbd2c..06352b0a7002 100644
--- a/sys/net/if_llatbl.c
+++ b/sys/net/if_llatbl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_llatbl.c,v 1.33 2020/09/11 15:16:00 roy Exp $	*/
+/*	$NetBSD: if_llatbl.c,v 1.34 2022/05/24 20:50:20 andvar Exp $	*/
 /*
  * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
  * Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -331,7 +331,7 @@ lltable_drop_entry_queue(struct llentry *lle)
 	}
 
 	KASSERTMSG(lle->la_numheld == 0,
-		"la_numheld %d > 0, pkts_droped %zd",
+		"la_numheld %d > 0, pkts_dropped %zd",
 		 lle->la_numheld, pkts_dropped);
 
 	return (pkts_dropped);
diff --git a/sys/net/lagg/if_laggproto.h b/sys/net/lagg/if_laggproto.h
index 70a2365fedd1..c9732ea52564 100644
--- a/sys/net/lagg/if_laggproto.h
+++ b/sys/net/lagg/if_laggproto.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_laggproto.h,v 1.16 2022/04/04 06:10:00 yamaguchi Exp $	*/
+/*	$NetBSD: if_laggproto.h,v 1.17 2022/05/24 20:50:20 andvar Exp $	*/
 
 /*
  * Copyright (c) 2021 Internet Initiative Japan Inc.
@@ -190,7 +190,7 @@ struct lagg_softc {
  *    - Updates of sc_var is serialized by sc_lock
  * - Items in sc_ports is protected by both psref (lp_psref) and
  *   pserialize contained in struct lagg_proto_softc
- *   - details are discribed in if_laggport.c and if_lagg_lacp.c
+ *   - details are described in if_laggport.c and if_lagg_lacp.c
  *   - Updates of items in sc_ports are serialized by sc_lock
  * - an instance referenced by lp_proto_ctx in struct lagg_port is
  *   protected by a lock in struct lagg_proto_softc
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index bc7e7bbe9bf2..9be5d5b881f0 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_icmp.h,v 1.43 2021/02/03 18:13:13 roy Exp $	*/
+/*	$NetBSD: ip_icmp.h,v 1.44 2022/05/24 20:50:20 andvar Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -170,7 +170,7 @@ __CTASSERT(sizeof(struct icmp_ext_obj_hdr) == 4);
 /*
  * Lower bounds on packet lengths for various types.
  * For the error advice packets must first insure that the
- * packet is large enought to contain the returned ip header.
+ * packet is large enough to contain the returned ip header.
  * Only then can we do the check to see if 64 bits of packet
  * data have been returned, since we need to check the returned
  * ip header length.
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 5b8b31caa658..7dde5326e764 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sctp_indata.c,v 1.10 2022/04/08 10:27:04 andvar Exp $ */
+/*	$NetBSD: sctp_indata.c,v 1.11 2022/05/24 20:50:20 andvar Exp $ */
 /*	$KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.10 2022/04/08 10:27:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.11 2022/05/24 20:50:20 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -3265,7 +3265,7 @@ sctp_try_advance_peer_ack_point(struct sctp_tcb *stcb,
 			/*
 			 * we don't want to de-queue it here. Just wait for the
 			 * next peer SACK to come with a new cumTSN and then
-			 * the chunk will be droped in the normal fashion.
+			 * the chunk will be dropped in the normal fashion.
 			 */
 			if (tp1->data) {
 				sctp_free_bufspace(stcb, asoc, tp1);
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index dcd32ebfa7e5..fff896b7b6c4 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -1,5 +1,5 @@
 /* $KAME: sctp_pcb.c,v 1.39 2005/06/16 18:29:25 jinmei Exp $ */
-/* $NetBSD: sctp_pcb.c,v 1.23 2021/12/10 20:36:04 andvar Exp $ */
+/* $NetBSD: sctp_pcb.c,v 1.24 2022/05/24 20:50:20 andvar Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.23 2021/12/10 20:36:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.24 2022/05/24 20:50:20 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1320,7 +1320,7 @@ sctp_inpcb_alloc(struct socket *so)
 	 * be taken out ... since the last set of fixes I
 	 * have not seen the "Found a GONE on list" has not
 	 * came out. But i am paranoid and we will leave this
-	 * in at the cost of efficency on allocation of PCB's.
+	 * in at the cost of efficiency on allocation of PCB's.
 	 * Probably we should move this to the invariant
 	 * compile options
 	 */
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index e6ae399bc3d4..b9786a021446 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $	*/
-/*	$NetBSD: sctp_pcb.h,v 1.4 2021/08/09 20:49:10 andvar Exp $ */
+/*	$NetBSD: sctp_pcb.h,v 1.5 2022/05/24 20:50:20 andvar Exp $ */
 
 #ifndef __SCTP_PCB_H__
 #define __SCTP_PCB_H__
@@ -375,7 +375,7 @@ struct sctp_tcb {
  * the locking i.e. we try to contain the lock and
  * unlock within the function that needs to lock it. This
  * sometimes mean we do extra locks and unlocks and loose
- * a bit of efficency, but if the performance statements about
+ * a bit of efficiency, but if the performance statements about
  * non-recursive locks are true this should not be a problem.
  * One issue that arises with this only lock when needed
  * is that if an implicit association setup is done we
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index d26086e00978..00672caa961c 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_input.c,v 1.432 2022/03/23 11:08:28 andvar Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.433 2022/05/24 20:50:20 andvar Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.432 2022/03/23 11:08:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.433 2022/05/24 20:50:20 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -3379,7 +3379,7 @@ tcp_xmit_timer(struct tcpcb *tp, uint32_t rtt)
 		 * *alpha, or 2^(-TCP_RTT_SHIFT).  Because
 		 * srtt is stored in 1/32 slow ticks, we conceptually
 		 * shift left 5 bits, subtract srtt to get the
-		 * diference, and then shift right by TCP_RTT_SHIFT
+		 * difference, and then shift right by TCP_RTT_SHIFT
 		 * (3) to obtain 1/8 of the difference.
 		 */
 		delta = (rtt << 2) - (tp->t_srtt >> TCP_RTT_SHIFT);
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index e7cf9fc1b603..37809118ba18 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_input.c,v 1.76 2022/05/19 19:18:03 christos Exp $	*/
+/*	$NetBSD: ipsec_input.c,v 1.77 2022/05/24 20:50:20 andvar Exp $	*/
 /*	$FreeBSD: ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $	*/
 /*	$OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $	*/
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.76 2022/05/19 19:18:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.77 2022/05/24 20:50:20 andvar Exp $");
 
 /*
  * IPsec input processing.
@@ -116,7 +116,7 @@ do {									\
  * XXX: if we have NAT-OA payload from IKE server,
  *      we must do the differential update of checksum.
  *
- * XXX: NAT-OAi/NAT-OAr drived from IKE initiator/responder.
+ * XXX: NAT-OAi/NAT-OAr derived from IKE initiator/responder.
  *      how to know the IKE side from kernel?
  */
 static struct mbuf *
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 63ff860b312d..54f19859ad44 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.274 2022/05/18 15:20:18 christos Exp $	*/
+/*	$NetBSD: key.c,v 1.275 2022/05/24 20:50:20 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.274 2022/05/18 15:20:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.275 2022/05/24 20:50:20 andvar Exp $");
 
 /*
  * This code is referred to RFC 2367
@@ -2513,7 +2513,7 @@ key_api_spddelete(struct socket *so, struct mbuf *m,
 
 	xpl0 = mhp->ext[SADB_X_EXT_POLICY];
 
-	/* checking the directon. */
+	/* checking the direction. */
 	switch (xpl0->sadb_x_policy_dir) {
 	case IPSEC_DIR_INBOUND:
 	case IPSEC_DIR_OUTBOUND:
diff --git a/tests/kernel/t_umount.sh b/tests/kernel/t_umount.sh
index b62ba10245fb..4784b641718d 100644
--- a/tests/kernel/t_umount.sh
+++ b/tests/kernel/t_umount.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_umount.sh,v 1.5 2010/11/07 17:51:19 jmmv Exp $
+# $NetBSD: t_umount.sh,v 1.6 2022/05/24 20:50:20 andvar Exp $
 #
 # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -80,7 +80,7 @@ EOF
 	cd "${mydir}"
 
 	test -e "${TMPMP}/under_the_mount" || \
-	    atf_fail "Original mount point dissapeared!"
+	    atf_fail "Original mount point disapeared!"
 }
 umount_cleanup()
 {
diff --git a/tests/lib/libc/locale/t_digittoint.c b/tests/lib/libc/locale/t_digittoint.c
index 9fbf20b0e8f3..f852338f0af4 100644
--- a/tests/lib/libc/locale/t_digittoint.c
+++ b/tests/lib/libc/locale/t_digittoint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_digittoint.c,v 1.2 2017/06/01 15:45:02 perseant Exp $ */
+/* $NetBSD: t_digittoint.c,v 1.3 2022/05/24 20:50:20 andvar Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_digittoint.c,v 1.2 2017/06/01 15:45:02 perseant Exp $");
+__RCSID("$NetBSD: t_digittoint.c,v 1.3 2022/05/24 20:50:20 andvar Exp $");
 
 #include <locale.h>
 #include <stdio.h>
@@ -88,7 +88,7 @@ ATF_TC(digittoint);
 ATF_TC_HEAD(digittoint, tc)
 {
 	atf_tc_set_md_var(tc, "descr",
-		"Checks digittoint under diferent locales");
+		"Checks digittoint under different locales");
 }
 
 ATF_TC_BODY(digittoint, tc)
diff --git a/tests/lib/libc/locale/t_wctype.c b/tests/lib/libc/locale/t_wctype.c
index e6aa29307545..271da9f8927e 100644
--- a/tests/lib/libc/locale/t_wctype.c
+++ b/tests/lib/libc/locale/t_wctype.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_wctype.c,v 1.2 2017/07/12 17:32:51 perseant Exp $ */
+/* $NetBSD: t_wctype.c,v 1.3 2022/05/24 20:50:20 andvar Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_wctype.c,v 1.2 2017/07/12 17:32:51 perseant Exp $");
+__RCSID("$NetBSD: t_wctype.c,v 1.3 2022/05/24 20:50:20 andvar Exp $");
 
 #include <locale.h>
 #include <stdio.h>
@@ -262,7 +262,7 @@ ATF_TC(ctype);
 ATF_TC_HEAD(ctype, tc)
 {
 	atf_tc_set_md_var(tc, "descr",
-		"Checks is* and isw* under diferent locales");
+		"Checks is* and isw* under different locales");
 }
 
 ATF_TC_BODY(ctype, tc)
diff --git a/tests/usr.bin/printf/printf.sh b/tests/usr.bin/printf/printf.sh
index b7593cb7a723..c98ce46ae5b2 100644
--- a/tests/usr.bin/printf/printf.sh
+++ b/tests/usr.bin/printf/printf.sh
@@ -1,4 +1,4 @@
-# $NetBSD: printf.sh,v 1.8 2021/05/19 22:45:49 kre Exp $
+# $NetBSD: printf.sh,v 1.9 2022/05/24 20:50:20 andvar Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1561,7 +1561,7 @@ NetBSD_extensions()
 	expect 99.000000	'%f'		'"c'
 	expect 97		'%g'		'"a'
 
-	# NetBSD (non-POSIX) format excape extensions
+	# NetBSD (non-POSIX) format escape extensions
 	expect ''		'\e'
 	expect ''		'\E'
 	expect ''		'\e\E'
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index c7b53de1ebb2..2a1f34362ae5 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.30 2020/05/07 13:40:20 kim Exp $	*/
+/*	$NetBSD: util.c,v 1.31 2022/05/24 20:50:20 andvar Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -72,7 +72,7 @@
 #if 0
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: util.c,v 1.30 2020/05/07 13:40:20 kim Exp $");
+__RCSID("$NetBSD: util.c,v 1.31 2022/05/24 20:50:20 andvar Exp $");
 #endif
 #endif /* not lint */
 
@@ -212,7 +212,7 @@ enter_lastlog(PERSON *pn)
 		/*
 		 * and if it's not any of the current logins
 		 * can't use time comparison because there may be a small
-		 * discrepency since login calls time() twice
+		 * discrepancy since login calls time() twice
 		 */
 		for (w = pn->whead; doit && w != NULL; w = w->next)
 			if (w->info == LOGGEDIN &&
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 9b5f6c07afc1..1cde64b16911 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: eval.c,v 1.66 2008/08/21 21:01:47 espie Exp $	*/
-/*	$NetBSD: eval.c,v 1.28 2020/06/27 19:18:58 uwe Exp $	*/
+/*	$NetBSD: eval.c,v 1.29 2022/05/24 20:50:21 andvar Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: eval.c,v 1.28 2020/06/27 19:18:58 uwe Exp $");
+__RCSID("$NetBSD: eval.c,v 1.29 2022/05/24 20:50:21 andvar Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
@@ -910,7 +910,7 @@ dosub(const char *argv[], int argc)
  * language. Within mapvec, we replace every character of "from" with
  * the corresponding character in "to". If "to" is shorter than "from",
  * than the corresponding entries are null, which means that those
- * characters dissapear altogether. Furthermore, imagine
+ * characters disapear altogether. Furthermore, imagine
  * map(dest, "sourcestring", "srtin", "rn..*") type call. In this case,
  * `s' maps to `r', `r' maps to `n' and `n' maps to `*'. Thus, `s'
  * ultimately maps to `*'. In order to achieve this effect in an efficient
diff --git a/usr.sbin/acpitools/acpidump/acpi.c b/usr.sbin/acpitools/acpidump/acpi.c
index a8b7c9041f53..259aea068cc3 100644
--- a/usr.sbin/acpitools/acpidump/acpi.c
+++ b/usr.sbin/acpitools/acpidump/acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.54 2022/02/13 22:20:09 andvar Exp $ */
+/* $NetBSD: acpi.c,v 1.55 2022/05/24 20:50:21 andvar Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: acpi.c,v 1.54 2022/02/13 22:20:09 andvar Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.55 2022/05/24 20:50:21 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -1151,7 +1151,7 @@ acpi_print_madt(ACPI_SUBTABLE_HEADER *mp)
 		printf("\tGICR ADDR=%016jx\n",
 		    (uintmax_t)gicc->GicrBaseAddress);
 		printf("\tMPIDR=%jx\n", (uintmax_t)gicc->ArmMpidr);
-		printf("\tEfficency Class=%d\n", (u_int)gicc->EfficiencyClass);
+		printf("\tEfficiency Class=%d\n", (u_int)gicc->EfficiencyClass);
 		break;
 	case ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR:
 		gicd = (ACPI_MADT_GENERIC_DISTRIBUTOR *)mp;
diff --git a/usr.sbin/altq/libaltq/qop_hfsc.c b/usr.sbin/altq/libaltq/qop_hfsc.c
index a9704f0e73c6..c0f33e2cafd9 100644
--- a/usr.sbin/altq/libaltq/qop_hfsc.c
+++ b/usr.sbin/altq/libaltq/qop_hfsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: qop_hfsc.c,v 1.10 2013/10/19 17:16:37 christos Exp $	*/
+/*	$NetBSD: qop_hfsc.c,v 1.11 2022/05/24 20:50:21 andvar Exp $	*/
 /*	$KAME: qop_hfsc.c,v 1.12 2005/01/05 04:53:47 itojun Exp $	*/
 /*
  * Copyright (C) 1999-2000
@@ -245,7 +245,7 @@ hfsc_class_parser(const char *ifname, const char *class_name,
 		flags |= HFCF_RED;
 
 	/*
-	 * if the link-sharing service curve is diffrent from
+	 * if the link-sharing service curve is different from
 	 * the real-time service curve, we first create a class with the
 	 * smaller service curve and then modify the other service curve.
 	 */