diff --git a/distrib/notes/hp300/upgrade b/distrib/notes/hp300/upgrade
index 93299942e663..7f9a8fb9bf23 100644
--- a/distrib/notes/hp300/upgrade
+++ b/distrib/notes/hp300/upgrade
@@ -1,4 +1,4 @@
-.\"	$NetBSD: upgrade,v 1.20 2019/11/21 19:23:18 martin Exp $
+.\"	$NetBSD: upgrade,v 1.21 2022/05/24 06:27:59 andvar Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -59,7 +59,7 @@ Boot your \*M into
 .Sq "single-user mode" :
 .Pp
 Follow the instructions in the section above on
-.Sx Chosing a kernel location
+.Sx Choosing a kernel location
 and type
 .Li -s
 at the prompt.
@@ -96,7 +96,7 @@ might overwrite another partition or the end of the disk).
 Boot the miniroot:
 .Pp
 Follow the instructions in the section above on
-.Sx Chosing a kernel location
+.Sx Choosing a kernel location
 and type
 .Li rd0b:netbsd
 at the prompt.
diff --git a/games/phantasia/misc.c b/games/phantasia/misc.c
index 21fadbab5ad7..e18ae06b6a0b 100644
--- a/games/phantasia/misc.c
+++ b/games/phantasia/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.23 2021/05/02 12:50:46 rillig Exp $	*/
+/*	$NetBSD: misc.c,v 1.24 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*
  * misc.c  Phantasia miscellaneous support routines
@@ -463,7 +463,7 @@ allstatslist(void)
 const char   *
 descrtype(struct player *playerp, phbool shortflag)
 {
-	int     type;		/* for caluculating result subscript */
+	int     type;		/* for calculating result subscript */
 	static const char *const results[] =/* description table */
 	{
 		" Magic User", " MU",
diff --git a/games/trek/dcrept.c b/games/trek/dcrept.c
index eebd0349bb65..eea8762a731a 100644
--- a/games/trek/dcrept.c
+++ b/games/trek/dcrept.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dcrept.c,v 1.10 2009/05/24 22:55:03 dholland Exp $	*/
+/*	$NetBSD: dcrept.c,v 1.11 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dcrept.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dcrept.c,v 1.10 2009/05/24 22:55:03 dholland Exp $");
+__RCSID("$NetBSD: dcrept.c,v 1.11 2022/05/24 06:27:59 andvar Exp $");
 #endif
 #endif /* not lint */
 
@@ -92,7 +92,7 @@ dcrept(int v __unused)
 			Device[e->systemname].name, x * m1 + 0.005,
 			x * m2 + 0.005);
 
-		/* do a little consistancy checking */
+		/* do a little consistency checking */
 	}
 
 	/* if everything was ok, reassure the nervous captain */
diff --git a/games/trek/setwarp.c b/games/trek/setwarp.c
index b0ab045399c2..7f517d6da608 100644
--- a/games/trek/setwarp.c
+++ b/games/trek/setwarp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: setwarp.c,v 1.9 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setwarp.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: setwarp.c,v 1.9 2022/05/24 06:27:59 andvar Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
 **  SET WARP FACTOR
 **
 **	The warp factor is set for future move commands.  It is
-**	checked for consistancy.
+**	checked for consistency.
 */
 
 /*ARGSUSED*/
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index bf630db0be26..7962c3823b54 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfscanf.c,v 1.46 2022/04/19 20:32:15 rillig Exp $	*/
+/*	$NetBSD: vfscanf.c,v 1.47 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.41 2007/01/09 00:28:07 imp Exp $");
 #else
-__RCSID("$NetBSD: vfscanf.c,v 1.46 2022/04/19 20:32:15 rillig Exp $");
+__RCSID("$NetBSD: vfscanf.c,v 1.47 2022/05/24 06:27:59 andvar Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -905,7 +905,7 @@ doswitch:
 			 * z', but treats `a-a' as `the letter a, the
 			 * character -, and the letter a'.
 			 *
-			 * For compatibility, the `-' is not considerd
+			 * For compatibility, the `-' is not considered
 			 * to define a range if the character following
 			 * it is either a close bracket (required by ANSI)
 			 * or is not numerically greater than the character
diff --git a/lib/libresolv/dst_api.c b/lib/libresolv/dst_api.c
index 19ed6bc9ae55..da3394f150a1 100644
--- a/lib/libresolv/dst_api.c
+++ b/lib/libresolv/dst_api.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dst_api.c,v 1.8 2022/01/24 09:14:37 andvar Exp $	*/
+/*	$NetBSD: dst_api.c,v 1.9 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -40,7 +40,7 @@
 #if 0
 static const char rcsid[] = "Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp ";
 #else
-__RCSID("$NetBSD: dst_api.c,v 1.8 2022/01/24 09:14:37 andvar Exp $");
+__RCSID("$NetBSD: dst_api.c,v 1.9 2022/05/24 06:27:59 andvar Exp $");
 #endif
 
 
@@ -537,7 +537,7 @@ dst_s_read_public_key(const char *in_name, const u_int16_t in_id, int in_alg)
 	while ((c = getc(fp)) != EOF)
 		if (!isspace(c))
 			break;
-	ungetc(c, fp);		/*%< return the charcter to the input field */
+	ungetc(c, fp);		/*%< return the character to the input field */
 	/* Handle hex!! FIXME.  */
 
 	if (fscanf(fp, "%d %d %d", &flags, &proto, &alg) != 3) {
diff --git a/sbin/atactl/atactl.8 b/sbin/atactl/atactl.8
index b3909d04c900..08c6839a6030 100644
--- a/sbin/atactl/atactl.8
+++ b/sbin/atactl/atactl.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: atactl.8,v 1.31 2019/05/31 16:38:27 wiz Exp $
+.\"	$NetBSD: atactl.8,v 1.32 2022/05/24 06:27:59 andvar Exp $
 .\"
 .\" Copyright (c) 1998, 2019 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -102,7 +102,7 @@ where # is an integer within the scale 0-253; being 0 the mode with the
 lowest power consumption (and thus the worse performance) and 253 the mode
 which provides the better performance at a cost of more power consumption.
 .Pp
-It should be noted that the effect of the value need not be continous.
+It should be noted that the effect of the value need not be continuous.
 For example, a device might provide only two modes: one from 0 to 126
 and other from 127 to 253.
 Per the specification, values of 127 and higher do not permit the device
diff --git a/sbin/nvmectl/bignum.c b/sbin/nvmectl/bignum.c
index 0288fe24336a..9e5da8e03f14 100644
--- a/sbin/nvmectl/bignum.c
+++ b/sbin/nvmectl/bignum.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bignum.c,v 1.4 2021/11/10 16:02:14 msaitoh Exp $	*/
+/*	$NetBSD: bignum.c,v 1.5 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2012 Alistair Crooks <agc@NetBSD.org>
@@ -1664,7 +1664,7 @@ mp_2expt(mp_int * a, int b)
 }
 
 /* pre-calculate the value required for Barrett reduction
- * For a given modulus "b" it calulates the value required in "a"
+ * For a given modulus "b" it calculates the value required in "a"
  */
 static int
 mp_reduce_setup(mp_int * a, mp_int * b)
diff --git a/sys/arch/acorn32/stand/boot32/boot32.c b/sys/arch/acorn32/stand/boot32/boot32.c
index daefe4dc96ad..dabe3f15b0f4 100644
--- a/sys/arch/acorn32/stand/boot32/boot32.c
+++ b/sys/arch/acorn32/stand/boot32/boot32.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot32.c,v 1.49 2022/04/29 21:03:08 rin Exp $	*/
+/*	$NetBSD: boot32.c,v 1.50 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2002 Reinoud Zandijk
@@ -409,7 +409,7 @@ get_memory_configuration(void)
 		DRAM_pages[top_bank  ] -= one_mb_pages;
 		dram_blocks++;
 
-		/* Map video memory at the end of the choosen DIMM */
+		/* Map video memory at the end of the chosen DIMM */
 		videomem_start          = DRAM_addr[video_bank] +
 		    (DRAM_pages[video_bank] - videomem_pages)*nbpp;
 		DRAM_pages[video_bank] -= videomem_pages;
diff --git a/sys/arch/arc/arc/platform.c b/sys/arch/arc/arc/platform.c
index 90bd6baa7f22..4338da8e801d 100644
--- a/sys/arch/arc/arc/platform.c
+++ b/sys/arch/arc/arc/platform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: platform.c,v 1.6 2008/04/28 20:23:13 martin Exp $	*/
+/*	$NetBSD: platform.c,v 1.7 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.6 2008/04/28 20:23:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.7 2022/05/24 06:28:00 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,7 +85,7 @@ ident_platform(void)
 		}
 		printf(". ");
 		print_platform(plattab[matched]);
-		printf(" is choosed.\n");
+		printf(" is chosen.\n");
 	}
 	if (match)
 		platform = plattab[matched];
diff --git a/sys/arch/arm/iomd/vidc20config.c b/sys/arch/arm/iomd/vidc20config.c
index 893ce1fb755c..5859ff1cb37b 100644
--- a/sys/arch/arm/iomd/vidc20config.c
+++ b/sys/arch/arm/iomd/vidc20config.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc20config.c,v 1.35 2021/09/19 10:34:08 andvar Exp $	*/
+/*	$NetBSD: vidc20config.c,v 1.36 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*
  * Copyright (c) 2001 Reinoud Zandijk
@@ -42,13 +42,13 @@
  * This file is the lower basis of the wscons driver for VIDC based ARM machines.
  * It features the initialisation and all VIDC writing and keeps in internal state
  * copy.
- * Its currenly set up as a library file and not as a device; it could be named
+ * Its currently set up as a library file and not as a device; it could be named
  * vidcvideo0 eventually.
  */
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.35 2021/09/19 10:34:08 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.36 2022/05/24 06:28:00 andvar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -406,7 +406,7 @@ void *vidcvideo_hwscroll_back(void *cookie)
 }
 
 
-/* this function is to be called perferably at vsync */
+/* this function is to be called preferably at vsync */
 void vidcvideo_progr_scroll(void)
 {
 
diff --git a/sys/arch/atari/atari/atari_init.c b/sys/arch/atari/atari/atari_init.c
index b83239453943..52d2a309eca7 100644
--- a/sys/arch/atari/atari/atari_init.c
+++ b/sys/arch/atari/atari/atari_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: atari_init.c,v 1.103 2021/12/12 13:05:13 andvar Exp $	*/
+/*	$NetBSD: atari_init.c,v 1.104 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.103 2021/12/12 13:05:13 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.104 2022/05/24 06:28:00 andvar Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mbtype.h"
@@ -127,7 +127,7 @@ int iomem_malloc_safe;
  * All info needed to generate a panic dump. All fields are setup by
  * start_c().
  * XXX: Should sheck usage of phys_segs. There is some unwanted overlap
- *      here.... Also, the name is badly choosen. Phys_segs contains the
+ *      here.... Also, the name is badly chosen. Phys_segs contains the
  *      segment descriptions _after_ reservations are made.
  * XXX: 'lowram' is obsoleted by the new panicdump format
  */
diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c
index 67f4feb370f6..b276deb29a7c 100644
--- a/sys/arch/atari/atari/disksubr.c
+++ b/sys/arch/atari/atari/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.44 2019/04/03 22:10:49 christos Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.45 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.44 2019/04/03 22:10:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.45 2022/05/24 06:28:00 andvar Exp $");
 
 #ifndef DISKLABEL_NBDA
 #define	DISKLABEL_NBDA	/* required */
@@ -126,7 +126,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
 		uprintf("Warning: unknown disklabel format"
 		    "- assuming empty disk\n");
 
-	/* Calulate new checksum. */
+	/* Calculate new checksum. */
 	lp->d_magic = lp->d_magic2 = DISKMAGIC;
 	lp->d_checksum = 0;
 	lp->d_checksum = dkcksum(lp);
diff --git a/sys/arch/hpcsh/dev/hd64461/hd64461video.c b/sys/arch/hpcsh/dev/hd64461/hd64461video.c
index 533a82e0ecad..e13e701e70a9 100644
--- a/sys/arch/hpcsh/dev/hd64461/hd64461video.c
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461video.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461video.c,v 1.55 2021/08/07 16:18:54 thorpej Exp $	*/
+/*	$NetBSD: hd64461video.c,v 1.56 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461video.c,v 1.55 2021/08/07 16:18:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461video.c,v 1.56 2022/05/24 06:28:00 andvar Exp $");
 
 #include "opt_hd64461video.h"
 // #define HD64461VIDEO_HWACCEL
@@ -898,7 +898,7 @@ hd64461video_font_set_attr(struct hd64461video_softc *sc,
 
 }
 
-/* return frame buffer virtual address of charcter #n */
+/* return frame buffer virtual address of character #n */
 STATIC vaddr_t
 hd64461video_font_start_addr(struct hd64461video_softc *sc, int n)
 {
diff --git a/sys/arch/mipsco/mipsco/disksubr.c b/sys/arch/mipsco/mipsco/disksubr.c
index 05e3585dd2ec..b52e6bbb715a 100644
--- a/sys/arch/mipsco/mipsco/disksubr.c
+++ b/sys/arch/mipsco/mipsco/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.28 2019/04/03 22:10:50 christos Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.29 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2019/04/03 22:10:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2022/05/24 06:28:00 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -201,7 +201,7 @@ ioerror:
 }
 
 /*
- * Convertion table for mapping partition numbers and types between
+ * Conversion table for mapping partition numbers and types between
  * a MIPS volume header and a BSD partition table.
  *
  * Mips volume header compatibility is required in order to boot
diff --git a/sys/arch/ofppc/ofppc/disksubr.c b/sys/arch/ofppc/ofppc/disksubr.c
index 5f001966df0d..ef6f416d1e62 100644
--- a/sys/arch/ofppc/ofppc/disksubr.c
+++ b/sys/arch/ofppc/ofppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.29 2019/04/03 22:10:51 christos Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.30 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2010 Frank Wille.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2019/04/03 22:10:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.30 2022/05/24 06:28:00 andvar Exp $");
 
 #include "opt_disksubr.h"
 
@@ -558,7 +558,7 @@ read_rdb_label(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
 		osdep->pblist[osdep->pbindex[i] = cindex++] = nextb;
 	}
 	/*
-	 * calulate new checksum.
+	 * calculate new checksum.
 	 */
 	lp->d_magic = lp->d_magic2 = DISKMAGIC;
 	lp->d_checksum = 0;
diff --git a/sys/arch/sh3/sh3/vm_machdep.c b/sys/arch/sh3/sh3/vm_machdep.c
index a3129af07038..15eb9b1bdf90 100644
--- a/sys/arch/sh3/sh3/vm_machdep.c
+++ b/sys/arch/sh3/sh3/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.81 2020/11/30 05:33:32 msaitoh Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.82 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.81 2020/11/30 05:33:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.82 2022/05/24 06:28:00 andvar Exp $");
 
 #include "opt_kstack_debug.h"
 
@@ -299,7 +299,7 @@ cpu_lwp_free2(struct lwp *l)
 
 /*
  * Map an IO request into kernel virtual address space.  Requests fall into
- * one of five catagories:
+ * one of five categories:
  *
  *	B_PHYS|B_UAREA:	User u-area swap.
  *			Address is relative to start of u-area.
diff --git a/sys/arch/x86/x86/fpu.c b/sys/arch/x86/x86/fpu.c
index 7646c7d59896..6730a1febce7 100644
--- a/sys/arch/x86/x86/fpu.c
+++ b/sys/arch/x86/x86/fpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.77 2022/04/01 19:57:22 riastradh Exp $	*/
+/*	$NetBSD: fpu.c,v 1.78 2022/05/24 06:28:00 andvar Exp $	*/
 
 /*
  * Copyright (c) 2008, 2019 The NetBSD Foundation, Inc.  All
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.77 2022/04/01 19:57:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.78 2022/05/24 06:28:00 andvar Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -446,7 +446,7 @@ fpu_kern_leave(void)
  * on more than one value or if the user process modifies the control
  * word while a status word bit is already set (which this is a sign
  * of bad coding).
- * We have no choise than to narrow them down to one bit, since we must
+ * We have no choice than to narrow them down to one bit, since we must
  * not send a trapcode that is not exactly one of the FPE_ macros.
  *
  * The mechanism has a static table with 127 entries.  Each combination
diff --git a/sys/dev/hdaudio/hdafg.c b/sys/dev/hdaudio/hdafg.c
index dd042e3c1096..f4a441babdd1 100644
--- a/sys/dev/hdaudio/hdafg.c
+++ b/sys/dev/hdaudio/hdafg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.27 2022/03/21 09:20:04 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.28 2022/05/24 06:28:00 andvar Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.27 2022/03/21 09:20:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.28 2022/05/24 06:28:00 andvar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3761,7 +3761,7 @@ hdafg_attach(device_t parent, device_t self, void *opaque)
 
 	hda_debug(sc, "preparing pin controls\n");
 	hdafg_prepare_pin_controls(sc);
-	hda_debug(sc, "commiting settings\n");
+	hda_debug(sc, "committing settings\n");
 	hdafg_commit(sc);
 
 	hda_debug(sc, "setup jack sensing\n");
diff --git a/sys/dev/hpc/files.hpcapm b/sys/dev/hpc/files.hpcapm
index fe70c33598b8..9ccddafe03e2 100644
--- a/sys/dev/hpc/files.hpcapm
+++ b/sys/dev/hpc/files.hpcapm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hpcapm,v 1.4 2009/04/03 05:01:09 uwe Exp $
+#	$NetBSD: files.hpcapm,v 1.5 2022/05/24 06:28:01 andvar Exp $
 #	H/PC APM device emulator
 
 include "dev/hpc/apm/files.apm"
@@ -12,7 +12,7 @@ include "dev/hpc/apm/files.apm"
 #
 #   apm0 at hpcapm0
 #
-# for those who do driver convertion to pmf(9).
+# for those who do driver conversion to pmf(9).
 attach	apm at apmdevif with apm_apmdevif
 file	dev/hpc/apm_apmdevif.c	apm_apmdevif
 
diff --git a/sys/dev/i2c/sgp40.c b/sys/dev/i2c/sgp40.c
index 335ba85aefe3..4ad77133e8fe 100644
--- a/sys/dev/i2c/sgp40.c
+++ b/sys/dev/i2c/sgp40.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sgp40.c,v 1.4 2022/05/22 11:27:35 andvar Exp $	*/
+/*	$NetBSD: sgp40.c,v 1.5 2022/05/24 06:28:01 andvar Exp $	*/
 
 /*
  * Copyright (c) 2021 Brad Spencer <brad@anduin.eldar.org>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgp40.c,v 1.4 2022/05/22 11:27:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgp40.c,v 1.5 2022/05/24 06:28:01 andvar Exp $");
 
 /*
   Driver for the Sensirion SGP40 MOx gas sensor for air quality
@@ -159,16 +159,16 @@ sgp40_compute_temp_comp(int unconverted)
 {
 	/*
 	 * The published algorithm for this conversion is:
-	 * (temp_in_celcius + 45) * 65535 / 175
+	 * (temp_in_celsius + 45) * 65535 / 175
 	 *
 	 * However, this did not exactly yield the results that
 	 * the example in the data sheet, so something a little
 	 * different was done.
 	 *
-	 * (temp_in_celcius + 45) * 65536 / 175
+	 * (temp_in_celsius + 45) * 65536 / 175
 	 *
 	 * This was also scaled up by 10^2 and then scaled back to
-	 * preserve some percision.  37449 is simply (65536 * 100) / 175
+	 * preserve some precision.  37449 is simply (65536 * 100) / 175
 	 * and rounded.
 	 */
 
@@ -191,7 +191,7 @@ sgp40_compute_rh_comp(int unconverted)
 	 * %rh * 65536 / 100
 	 *
 	 * This was also scaled up by 10^2 and then scaled back to
-	 * preserve some percision.  The value is also latched to 65535
+	 * preserve some precision.  The value is also latched to 65535
 	 * as an upper limit.
 	 */
 
diff --git a/sys/dev/i2c/sht4xreg.h b/sys/dev/i2c/sht4xreg.h
index 91eb9edeabcb..0de2e83475b6 100644
--- a/sys/dev/i2c/sht4xreg.h
+++ b/sys/dev/i2c/sht4xreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sht4xreg.h,v 1.1 2021/10/03 17:27:02 brad Exp $	*/
+/*	$NetBSD: sht4xreg.h,v 1.2 2022/05/24 06:28:01 andvar Exp $	*/
 
 /*
  * Copyright (c) 2021 Brad Spencer <brad@anduin.eldar.org>
@@ -25,13 +25,13 @@
 #define SHT4X_SOFT_RESET 0x94
 
 /* If you do not use the heater, you can take measurements at a couple
-   of different percisions */
+   of different precisions */
 #define SHT4X_MEASURE_HIGH_PRECISION 0xFD
 #define SHT4X_MEASURE_MEDIUM_PRECISION 0xF6
 #define SHT4X_MEASURE_LOW_PRECISION 0xE0
 
 /* The SHT4X chip only support the heater when reading with the
-   highest percision and then only when the measurement is happening.
+   highest precision and then only when the measurement is happening.
    You can have the heater on for 1 second or 1 tenth of a second.
    After the measurement the heater will switch itself off */
 #define SHT4X_MEASURE_HIGH_PRECISION_HIGH_HEAT_1_S 0x39
diff --git a/sys/dev/isa/gusreg.h b/sys/dev/isa/gusreg.h
index 7a4a70bca519..c5c1ab10ced3 100644
--- a/sys/dev/isa/gusreg.h
+++ b/sys/dev/isa/gusreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gusreg.h,v 1.9 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: gusreg.h,v 1.10 2022/05/24 06:28:01 andvar Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -189,7 +189,7 @@
 
 #define GUSMASK_DMA_ENABLE	0x01		/* Enable DMA transfer */
 #define GUSMASK_DMA_READ	0x02		/* 1=read, 0=write */
-#define GUSMASK_DMA_WRITE	0x00		/* for consistancy */
+#define GUSMASK_DMA_WRITE	0x00		/* for consistency */
 #define GUSMASK_DMA_WIDTH	0x04		/* Data transfer width */
 #define GUSMASK_DMA_R0		0x00		/* Various DMA speeds */
 #define GUSMASK_DMA_R1		0x08
diff --git a/sys/dev/isapnp/files.isapnp b/sys/dev/isapnp/files.isapnp
index 07ee30b74766..3a11af13fd03 100644
--- a/sys/dev/isapnp/files.isapnp
+++ b/sys/dev/isapnp/files.isapnp
@@ -1,9 +1,9 @@
-#	$NetBSD: files.isapnp,v 1.40 2020/01/19 20:00:36 thorpej Exp $
+#	$NetBSD: files.isapnp,v 1.41 2022/05/24 06:28:01 andvar Exp $
 #
 # Config file and device description for machine-independent ISAPnP code.
 # Included by ports that need it.
 
-# XXX: We don't use locators currenly...
+# XXX: We don't use locators currently...
 
 device	isapnp {[port = -1], [size = 0],
 	     [iomem = -1], [iosiz = 0],
diff --git a/sys/dev/microcode/tools/array2bin.c b/sys/dev/microcode/tools/array2bin.c
index 34c962ed1b40..ade4029b677f 100644
--- a/sys/dev/microcode/tools/array2bin.c
+++ b/sys/dev/microcode/tools/array2bin.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: array2bin.c,v 1.1 2008/05/04 23:50:32 ad Exp $	*/
+/*	$NetBSD: array2bin.c,v 1.2 2022/05/24 06:28:01 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,12 +29,12 @@
 /*
  * Takes an array from array.h named array[], and spits it out as a
  * binary image.  NO DECOMPRESSION IS DONE.  This is for taking existing
- * images formatted as C arrays, for convertion to binary files.
+ * images formatted as C arrays, for conversion to binary files.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: array2bin.c,v 1.1 2008/05/04 23:50:32 ad Exp $");
+__RCSID("$NetBSD: array2bin.c,v 1.2 2022/05/24 06:28:01 andvar Exp $");
 #endif /* !lint */
 
 #include <sys/module.h>
diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c
index f1706ae35c19..7c70991bdf5f 100644
--- a/sys/dev/pci/if_ntwoc_pci.c
+++ b/sys/dev/pci/if_ntwoc_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ntwoc_pci.c,v 1.31 2018/12/09 11:14:02 jdolecek Exp $	*/
+/*	$NetBSD: if_ntwoc_pci.c,v 1.32 2022/05/24 06:28:01 andvar Exp $	*/
 
 /*
  * Copyright (c) 1998 Vixie Enterprises
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.31 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.32 2022/05/24 06:28:01 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -714,7 +714,7 @@ ntwoc_pci_setup_dma(struct sca_softc *sc)
 	}
 
 	/*
-	 * as a consistancy check, addroff should be equal to the allocation
+	 * as a consistency check, addroff should be equal to the allocation
 	 * size.
 	 */
 	if (sc->scu_allocsize != addroff)
diff --git a/sys/fs/v7fs/v7fs.h b/sys/fs/v7fs/v7fs.h
index dc4eab083722..646949d34385 100644
--- a/sys/fs/v7fs/v7fs.h
+++ b/sys/fs/v7fs/v7fs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: v7fs.h,v 1.3 2022/05/22 11:27:36 andvar Exp $	*/
+/*	$NetBSD: v7fs.h,v 1.4 2022/05/24 06:28:01 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -162,7 +162,7 @@ struct v7fs_inode_diskimage {
 
 /* File type */
 #define	V7FS_IFMT	0170000	/* File type mask */
-#define	V7FS_IFCHR	0020000	/* charcter device */
+#define	V7FS_IFCHR	0020000	/* character device */
 #define	V7FS_IFDIR	0040000	/* directory */
 #define	V7FS_IFBLK	0060000	/* block device */
 #define	V7FS_IFREG	0100000	/* file. */
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index c2902485725c..0a2d8bec60c6 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.282 2022/04/09 23:51:48 riastradh Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.283 2022/05/24 06:28:01 andvar Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018,
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.282 2022/04/09 23:51:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.283 2022/05/24 06:28:01 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -1004,7 +1004,7 @@ pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags,
 }
 
 /*
- * De-commision a pool resource.
+ * De-commission a pool resource.
  */
 void
 pool_destroy(struct pool *pp)
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 682f414016c1..2f3fe489b762 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vnops.c,v 1.323 2022/03/30 10:52:59 christos Exp $	*/
+/*	$NetBSD: nfs_vnops.c,v 1.324 2022/05/24 06:28:02 andvar Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.323 2022/03/30 10:52:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.324 2022/05/24 06:28:02 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -1346,7 +1346,7 @@ retry:
 				commit = fxdr_unsigned(int, *tl++);
 
 				/*
-				 * Return the lowest committment level
+				 * Return the lowest commitment level
 				 * obtained by any of the RPCs.
 				 */
 				if (committed == NFSV3WRITE_FILESYNC)
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 7e93d3592029..b824b9420070 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_subr.c,v 1.52 2020/04/21 15:04:12 christos Exp $	*/
+/*	$NetBSD: ffs_subr.c,v 1.53 2022/05/24 06:28:02 andvar Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.52 2020/04/21 15:04:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.53 2022/05/24 06:28:02 andvar Exp $");
 
 #include <sys/param.h>
 
@@ -174,7 +174,7 @@ ffs_fragacct(struct fs *fs, int fragmap, int32_t fraglist[], int cnt,
  * block operations
  *
  * check if a block is available
- *  returns true if all the correponding bits in the free map are 1
+ *  returns true if all the corresponding bits in the free map are 1
  *  returns false if any corresponding bit in the free map is 0
  */
 int
diff --git a/tests/rump/rumpkern/t_modlinkset.c b/tests/rump/rumpkern/t_modlinkset.c
index 7d725dc7cc07..bcf4fbbb9cee 100644
--- a/tests/rump/rumpkern/t_modlinkset.c
+++ b/tests/rump/rumpkern/t_modlinkset.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_modlinkset.c,v 1.3 2017/01/13 21:30:43 christos Exp $	*/
+/*	$NetBSD: t_modlinkset.c,v 1.4 2022/05/24 06:28:02 andvar Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ ATF_TC_HEAD(modlinkset, tc)
 }
 
 /*
- * We link against cd9660 and msdosfs (both chosed because the names
+ * We link against cd9660 and msdosfs (both chosen because the names
  * are unlikely to ever be a substring of a another file system).
  * Without proper linkset handling at most one will be reported.
  */
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index ef62caee2616..87a64e090626 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ac.c,v 1.26 2021/04/12 09:29:53 mrg Exp $ */
+/* $NetBSD: ac.c,v 1.27 2022/05/24 06:28:02 andvar Exp $ */
 
 /*-
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ac.c,v 1.26 2021/04/12 09:29:53 mrg Exp $");
+__RCSID("$NetBSD: ac.c,v 1.27 2022/05/24 06:28:02 andvar Exp $");
 #endif
 
 #include <sys/types.h>
@@ -63,7 +63,7 @@ struct user_list {
 };
 
 /*
- * this is for chosing whether to ignore a login
+ * this is for choosing whether to ignore a login
  */
 struct tty_list {
 	struct tty_list *next;
diff --git a/usr.sbin/mopd/mopcopy/mopcopy.c b/usr.sbin/mopd/mopcopy/mopcopy.c
index 2792d5518f21..aba558bbf866 100644
--- a/usr.sbin/mopd/mopcopy/mopcopy.c
+++ b/usr.sbin/mopd/mopcopy/mopcopy.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: mopcopy.c,v 1.11 2022/04/10 09:50:47 andvar Exp $	*/
+/*	$NetBSD: mopcopy.c,v 1.12 2022/05/24 06:28:02 andvar Exp $	*/
 
 /* mopcopy - Convert a Unix format kernel into something that
  * can be transferred via MOP.
  *
  * This code was written while referring to the NetBSD/vax boot
  * loader. Therefore anything that can be booted by the Vax
- * should be convertable with this program.
+ * should be convertible with this program.
  *
  * If necessary, the a.out header is stripped, and the program
  * segments are padded out. The BSS segment is zero filled.
@@ -49,7 +49,7 @@
 
 #include "port.h"
 #ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.11 2022/04/10 09:50:47 andvar Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.12 2022/05/24 06:28:02 andvar Exp $");
 #endif
 
 #include "os.h"