spelling fixes; from paul tagliamonte

amendments to his diff are noted on tech
2024-12-21 23:18:00 -08:00 · 2022-12-26 19:16:00 +00:00 · 2022-12-26 19:16:00 +00:00 · d9a51c353c
commit d9a51c353c
parent c0626e9e13
103 changed files with 230 additions and 230 deletions
--- a/usr.bin/aucat/abuf.c
+++ b/usr.bin/aucat/abuf.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: abuf.c,v 1.30 2017/01/03 07:33:22 ratchov Exp $	*/
+/*	$OpenBSD: abuf.c,v 1.31 2022/12/26 19:16:00 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -80,7 +80,7 @@ abuf_rgetblk(struct abuf *buf, int *rsize)
 }

 /*
- * discard "count" bytes at the start postion.
+ * discard "count" bytes at the start position.
 */
 void
 abuf_rdiscard(struct abuf *buf, int count)
--- a/usr.bin/aucat/dsp.c
+++ b/usr.bin/aucat/dsp.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: dsp.c,v 1.17 2021/07/05 08:29:59 ratchov Exp $	*/
+/*	$OpenBSD: dsp.c,v 1.18 2022/12/26 19:16:00 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -359,7 +359,7 @@ resamp_getcnt(struct resamp *p, int *icnt, int *ocnt)

 /*
 * Resample the given number of frames. The number of output frames
- * must match the coresponding number of input frames. Either always
+ * must match the corresponding number of input frames. Either always
 * use icnt and ocnt such that:
 *
 *	 icnt * oblksz = ocnt * iblksz
--- a/usr.bin/aucat/dsp.h
+++ b/usr.bin/aucat/dsp.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: dsp.h,v 1.9 2022/03/07 09:04:45 ratchov Exp $	*/
+/*	$OpenBSD: dsp.h,v 1.10 2022/12/26 19:16:00 jmc Exp $	*/
 /*
 * Copyright (c) 2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -61,7 +61,7 @@ typedef int adata_t;
 #define RESAMP_RATIO		64

 /*
- * Maximum size of the encording string (the longest possible
+ * Maximum size of the encoding string (the longest possible
 * encoding is ``s24le3msb'').
 */
 #define ENCMAX	10
--- a/usr.bin/aucat/sysex.h
+++ b/usr.bin/aucat/sysex.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: sysex.h,v 1.4 2015/01/21 08:43:55 ratchov Exp $	*/
+/*	$OpenBSD: sysex.h,v 1.5 2022/12/26 19:16:00 jmc Exp $	*/
 /*
 * Copyright (c) 2011 Alexandre Ratchov <alex@caoua.org>
 *
@ -46,7 +46,7 @@
 #define   SYSEX_MMC_LOC_CMD	0x01

 /*
- * sepcial "any" midi device number
+ * special "any" midi device number
 */
 #define SYSEX_DEV_ANY		0x7f

--- a/usr.bin/audioctl/audioctl.c
+++ b/usr.bin/audioctl/audioctl.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: audioctl.c,v 1.43 2021/07/12 15:09:19 beck Exp $	*/
+/*	$OpenBSD: audioctl.c,v 1.44 2022/12/26 19:16:00 jmc Exp $	*/
 /*
 * Copyright (c) 2016 Alexandre Ratchov <alex@caoua.org>
 *
@ -71,7 +71,7 @@ int fd, show_names = 1, quiet = 0;

 /*
 * parse encoding string (examples: s8, u8, s16, s16le, s24be ...)
- * and fill enconding fields of audio_swpar structure
+ * and fill encoding fields of audio_swpar structure
 */
 int
 strtoenc(struct audio_swpar *ap, char *p)
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: column.c,v 1.26 2018/06/22 12:27:00 rob Exp $	*/
+/*	$OpenBSD: column.c,v 1.27 2022/12/26 19:16:00 jmc Exp $	*/
 /*	$NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $	*/

 /*
@ -300,7 +300,7 @@ input(FILE *fp)

 			/*
 			 * Remember the width of the field,
-			 * NUL-terminate and remeber the content,
+			 * NUL-terminate and remember the content,
 			 * and advance beyond the separator, if any.
 			 */

--- a/usr.bin/compress/compress.h
+++ b/usr.bin/compress/compress.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: compress.h,v 1.15 2022/10/22 14:41:27 millert Exp $	*/
+/*	$OpenBSD: compress.h,v 1.16 2022/12/26 19:16:00 jmc Exp $	*/

 /*
 * Copyright (c) 1997 Michael Shalayeff
@ -38,7 +38,7 @@ struct z_info {
 };

 /*
- * making it any bigger does not affect perfomance very much.
+ * making it any bigger does not affect performance very much.
 * actually this value is just a little bit better than 8192.
 */
 #define Z_BUFSIZE 16384
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.320 2020/10/19 19:51:20 naddy Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.321 2022/12/26 19:16:00 jmc Exp $	*/
 /*
 * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 * All rights reserved.
@ -1663,7 +1663,7 @@ rcs_get_revision(const char *revstr, RCSFILE *rfp)

 	/*
 	 * If it was not a branch, thats ok the symbolic
-	 * name refered to a revision, so return the resolved
+	 * name referred to a revision, so return the resolved
 	 * revision for the given name. */
 	if (!RCSNUM_ISBRANCH(rev)) {
 		/* Sanity check: The first two elements of any
--- a/usr.bin/fgen/fgen.l
+++ b/usr.bin/fgen/fgen.l
@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: fgen.l,v 1.14 2021/12/13 18:28:40 deraadt Exp $	*/
+/*	$OpenBSD: fgen.l,v 1.15 2022/12/26 19:16:00 jmc Exp $	*/
 /*	$NetBSD: fgen.l,v 1.37 2016/03/08 20:13:44 christos Exp $	*/
 /* FLEX input for FORTH input file scanner */
 /*  
@ -1092,7 +1092,7 @@ main(int argc, char *argv[])

 /*
 * Tokenize one file.  This is a separate function so it can
- * be called recursively to parse mutiple levels of include files.
+ * be called recursively to parse multiple levels of include files.
 */

 static void
--- a/usr.bin/file/magdir/c-lang
+++ b/usr.bin/file/magdir/c-lang
@ -1,4 +1,4 @@
-#	$OpenBSD: c-lang,v 1.5 2009/04/24 18:54:34 chl Exp $
+#	$OpenBSD: c-lang,v 1.6 2022/12/26 19:16:01 jmc Exp $

 #------------------------------------------------------------------------------
 # c-lang:  file(1) magic for C programs (or REXX)
@ -22,7 +22,7 @@
 >7	string		x		version %.2s
 # We skip the path here, because it is often long (so file will
 # truncate it) and mostly redundant.
-# The inverted index functionality was added some time betwen
+# The inverted index functionality was added some time between
 # versions 11 and 15, so look for -q if version is above 14:
 >7	string		>14
 >>10	search/100	\ -q\ 		with inverted index
--- a/usr.bin/file/magdir/filesystems
+++ b/usr.bin/file/magdir/filesystems
@ -1,4 +1,4 @@
-#	$OpenBSD: filesystems,v 1.5 2009/12/23 02:24:39 krw Exp $
+#	$OpenBSD: filesystems,v 1.6 2022/12/26 19:16:01 jmc Exp $

 #------------------------------------------------------------------------------
 # filesystems:  file(1) magic for different filesystems
@ -135,7 +135,7 @@
 # updated by Joerg Jenderek
 # variables according to grub-0.97/stage1/stage1.S or
 # http://www.gnu.org/software/grub/manual/grub.html#Embedded-data
-# usual values are marked with comments to get only informations of strange GRUB loaders
+# usual values are marked with comments to get only information of strange GRUB loaders
 >0		ulelong		0x009048EB	
 >>0x41		ubyte		<2		
 >>>0x3E		ubyte		>2		\b; GRand Unified Bootloader
@ -163,7 +163,7 @@
 >>>>>379	string	GRUB\ \0		\b, GRUB version 0.95 or 0.96
 >>>>391		string	Geom\0Hard\ Disk\0Read\0\ Error\0
 >>>>>385	string	GRUB\ \0		\b, GRUB version 0.97
-#unkown version
+#unknown version
 >>>343		string	Geom\0Read\0\ Error\0	
 >>>>321		string	Loading\ stage1.5	\b, GRUB version x.y
 >>>380		string	Geom\0Hard\ Disk\0Read\0\ Error\0
@ -736,7 +736,7 @@
 # maximal short forward jump is 07fx
 >1		ubyte			<0xff	\b, code offset 0x%x
 # mtools-3.9.8/msdos.h
-# usual values are marked with comments to get only informations of strange FAT systems
+# usual values are marked with comments to get only information of strange FAT systems
 # valid sectorsize must be a power of 2 from 32 to 32768
 >>11		uleshort&0x000f	x		
 >>>11		uleshort	<32769		
@ -859,7 +859,7 @@
 # In the second sector (+0x200) are variables according to grub-0.97/stage2/asm.S or
 # grub-1.94/kern/i386/pc/startup.S
 # http://www.gnu.org/software/grub/manual/grub.html#Embedded-data
-# usual values are marked with comments to get only informations of strange GRUB loaders
+# usual values are marked with comments to get only information of strange GRUB loaders
 0x200	uleshort		0x70EA		
 # found only version 3.{1,2}
 >0x206		ubeshort	>0x0300		
--- a/usr.bin/file/magdir/jpeg
+++ b/usr.bin/file/magdir/jpeg
@ -1,4 +1,4 @@
-#	$OpenBSD: jpeg,v 1.4 2009/04/24 18:54:34 chl Exp $
+#	$OpenBSD: jpeg,v 1.5 2022/12/26 19:16:01 jmc Exp $

 #------------------------------------------------------------------------------
 # JPEG images
@ -121,7 +121,7 @@
 >>>>>(150.L+61)	byte	!0x30		\b%c
 # Here things get sticky.  We can do ONE MORE marker segment with
 # indirect addressing, and that's all.  It would be great if we could
-# do pointer arithemetic like in an assembler language.  Christos?
+# do pointer arithmetic like in an assembler language.  Christos?
 # And if there was some sort of looping construct to do searches, plus a few
 # named accumulators, it would be even more effective...
 # At least we can show a comment if no other segments got inserted before:
--- a/usr.bin/file/magdir/mathematica
+++ b/usr.bin/file/magdir/mathematica
@ -1,4 +1,4 @@
-#	$OpenBSD: mathematica,v 1.3 2009/04/24 18:54:34 chl Exp $
+#	$OpenBSD: mathematica,v 1.4 2022/12/26 19:16:01 jmc Exp $

 #------------------------------------------------------------------------------
 # mathematica:  file(1) magic for mathematica files
@ -11,7 +11,7 @@
 0	string	\064\024\011\000\035\000\000\000	Mathematica version 2 notebook

 # .ma
-# multiple possibilites:
+# multiple possibilities:

 0	string	(*^\n\n::[\011frontEndVersion\ =\ 	Mathematica notebook
 #>41	string	>\0	%s
@ -21,7 +21,7 @@
 #0	string	(*^\n\n::[\011Information	Mathematica notebook version 2.x
 #>675	string	>\0	%s #doesn't work well

-# there may be 'cr' instread of 'nl' in some does this matter?
+# there may be 'cr' instead of 'nl' in some does this matter?

 # generic:
 0	string	(*^\r\r::[\011	Mathematica notebook version 2.x
--- a/usr.bin/file/magdir/msdos
+++ b/usr.bin/file/magdir/msdos
@ -1,4 +1,4 @@
-#	$OpenBSD: msdos,v 1.7 2018/10/04 16:51:38 ccardenas Exp $
+#	$OpenBSD: msdos,v 1.8 2022/12/26 19:16:01 jmc Exp $

 #------------------------------------------------------------------------------
 # msdos:  file(1) magic for MS-DOS files
@ -44,7 +44,7 @@
 # probably some linker directive to set it.  The linker version was
 # 3.0, except for one ".exe" which had it as 4.20 (same damn linker!).
 #
-# many of the compressed formats were extraced from IDARC 1.23 source code
+# many of the compressed formats were extracted from IDARC 1.23 source code
 #
 0	string	MZ		MS-DOS executable
 !:mime	application/x-dosexec
@ -204,7 +204,7 @@
 >>>&1		string		x for DOS, Win or OS/2, emx %s
 >>&(&0x42.l-3)	byte		x 
 >>>&0x26	string		UPX \b, UPX compressed
-# and yet another guess: small .text, and after large .data is unusal, could be 32lite
+# and yet another guess: small .text, and after large .data is unusual, could be 32lite
 >>&0x2c		search/0xa0	.text
 >>>&0x0b	lelong		<0x2000
 >>>>&0		lelong		>0x6000 \b, 32lite compressed
--- a/usr.bin/file/magdir/sgml
+++ b/usr.bin/file/magdir/sgml
@ -1,4 +1,4 @@
-#	$OpenBSD: sgml,v 1.5 2009/04/24 18:54:34 chl Exp $
+#	$OpenBSD: sgml,v 1.6 2022/12/26 19:16:01 jmc Exp $

 #------------------------------------------------------------------------------
 # Type:	SVG Vectorial Graphics
@ -14,7 +14,7 @@
 # sgml:  file(1) magic for Standard Generalized Markup Language
 # HyperText Markup Language (HTML) is an SGML document type,
 # from Daniel Quinlan (quinlan@yggdrasil.com)
-# adapted to string extenstions by Anthon van der Neut <anthon@mnt.org)
+# adapted to string extensions by Anthon van der Neut <anthon@mnt.org)
 0	search/1/cB	\<!DOCTYPE\ html	HTML document text
 !:mime	text/html
 0	search/1/cb	\<head			HTML document text
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.36 2019/07/03 03:24:02 deraadt Exp $	*/
+/*	$OpenBSD: util.c,v 1.37 2022/12/26 19:16:01 jmc Exp $	*/

 /*
 * Copyright (c) 1989 The Regents of the University of California.
@ -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 &&
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: fetch.c,v 1.212 2022/11/09 17:41:05 claudio Exp $	*/
+/*	$OpenBSD: fetch.c,v 1.213 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/

 /*-
@ -934,7 +934,7 @@ noslash:
 					} else
 						loctail[1] = '\0';
 				}
-				/* Contruct URL from relative redirect */
+				/* Construct URL from relative redirect */
 				if (asprintf(&redirurl, "%s%s%s%s/%s%s",
 				    scheme, full_host,
 				    portnum ? ":" : "",
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: gencat.c,v 1.21 2022/12/04 23:50:48 cheloha Exp $	*/
+/*	$OpenBSD: gencat.c,v 1.22 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: gencat.c,v 1.9 1998/10/09 17:00:56 itohy Exp $	*/

 /*-
@ -388,7 +388,7 @@ getmsg(int fd, char *cptr, char quote)
 						++cptr;
 					}
 				} else {
-					warning(cptr, "unrecognized escape sequence; ignoring esacpe character");
+					warning(cptr, "unrecognized escape sequence; ignoring escape character");
 				}
 				break;
 			}
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: arcs.c,v 1.14 2015/12/06 23:22:51 guenther Exp $	*/
+/*	$OpenBSD: arcs.c,v 1.15 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: arcs.c,v 1.6 1995/04/19 07:15:52 cgd Exp $	*/

 /*
@ -354,7 +354,7 @@ cyclelink()
    arctype		*arcp;

 	/*
-	 *	Count the number of cycles, and initialze the cycle lists
+	 *	Count the number of cycles, and initialize the cycle lists
 	 */
    ncycle = 0;
    for ( nlp = nl ; nlp < npe ; nlp++ ) {
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: dfn.c,v 1.8 2014/03/16 18:38:30 guenther Exp $	*/
+/*	$OpenBSD: dfn.c,v 1.9 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: dfn.c,v 1.5 1995/04/19 07:15:56 cgd Exp $	*/

 /*
@ -69,7 +69,7 @@ dfn(nltype *parentp)
 	}
 #   endif /* DEBUG */
 	/*
-	 *	if we're already numbered, no need to look any furthur.
+	 *	if we're already numbered, no need to look any further.
 	 */
    if ( dfn_numbered( parentp ) ) {
 	return;
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@ -1,4 +1,4 @@
-.\"	$OpenBSD: indent.1,v 1.24 2022/03/31 17:27:25 naddy Exp $
+.\"	$OpenBSD: indent.1,v 1.25 2022/12/26 19:16:01 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.
@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)indent.1	8.1 (Berkeley) 7/1/93
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: December 26 2022 $
 .Dt INDENT 1
 .Os
 .Sh NAME
@ -488,7 +488,7 @@ has a
 .Dq forgiving
 parser.
 It attempts to cope with the usual sorts of
-incomplete and misformed syntax.
+incomplete and malformed syntax.
 In particular, the use of macros like:
 .Pp
 .Dl #define forever for(;;)
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: indent.c,v 1.32 2021/01/26 18:21:25 deraadt Exp $	*/
+/*	$OpenBSD: indent.c,v 1.33 2022/12/26 19:16:01 jmc Exp $	*/

 /*
 * Copyright (c) 1980, 1993
@ -474,7 +474,7 @@ main(int argc, char **argv)
 			fill_buffer();
 		    break;
 		}
-	    default:		/* it is the start of a normal statment */
+	    default:		/* it is the start of a normal statement */
 		if (flushed_nl)	/* if we flushed a newline, make sure it is
 				 * put back */
 		    force_nl = true;
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: indent_globs.h,v 1.15 2021/01/26 18:21:25 deraadt Exp $ */
+/*	$OpenBSD: indent_globs.h,v 1.16 2022/12/26 19:16:01 jmc Exp $ */
 /*
 * Copyright (c) 1985 Sun Microsystems, Inc.
 * Copyright (c) 1980, 1993
@ -249,7 +249,7 @@ extern struct parser_state {
    int         col_1;		/* set to true if the last token started in
 				 * column 1 */
    int         com_col;	/* this is the column in which the current
-				 * coment should start */
+				 * comment should start */
    int         com_ind;	/* the column in which comments to the right
 				 * of code should start */
    int         com_lines;	/* the number of lines with comments, set by
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: lexi.c,v 1.20 2016/06/06 06:43:03 tobiasu Exp $	*/
+/*	$OpenBSD: lexi.c,v 1.21 2022/12/26 19:16:01 jmc Exp $	*/

 /*
 * Copyright (c) 1980, 1993
@ -324,7 +324,7 @@ lexi(void)
 	    ps.last_u_d = true;	/* will make "int a -1" work */
 	last_code = ident;
 	return (ident);		/* the ident is not in the list */
-    }				/* end of procesing for alpanum character */
+    }				/* end of processing for alpanum character */

    /* Scan a non-alphanumeric token */

@ -341,7 +341,7 @@ lexi(void)
 	code = (had_eof ? 0 : newline);

 	/*
-	 * if data has been exausted, the newline is a dummy, and we should
+	 * if data has been exhausted, the newline is a dummy, and we should
 	 * return code to stop
 	 */
 	break;
--- a/usr.bin/less/main.c
+++ b/usr.bin/less/main.c
@ -128,7 +128,7 @@ main(int argc, char *argv[])
 		/* default prompt is medium */
 		pr_type = OPT_ON;

-		/* do not hilight search terms */
+		/* do not highlight search terms */
 		hilite_search = OPT_OFF;

 		/* do not use LESSOPEN */
--- a/usr.bin/less/search.c
+++ b/usr.bin/less/search.c
@ -433,7 +433,7 @@ add_hilite(struct hilite *anchor, struct hilite *hl)
 }

 /*
- * Hilight every character in a range of displayed characters.
+ * Highlight every character in a range of displayed characters.
 */
 static void
 create_hilites(off_t linepos, int start_index, int end_index, int *chpos)
--- a/usr.bin/lex/PSD.doc/lex.ms
+++ b/usr.bin/lex/PSD.doc/lex.ms
@ -1,4 +1,4 @@
-.\"	$OpenBSD: lex.ms,v 1.3 2004/04/06 10:00:32 jmc Exp $
+.\"	$OpenBSD: lex.ms,v 1.4 2022/12/26 19:16:01 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@ -1429,7 +1429,7 @@ is copied out after the Lex output.
 .PP
 Definitions intended for Lex are given
 before the first %% delimiter.  Any line in this section
-not contained between %{ and %}, and begining
+not contained between %{ and %}, and beginning
 in column 1, is assumed to define Lex substitution strings.
 The format of such lines is
 .DS I
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: ccl.c,v 1.8 2015/11/19 22:55:13 tedu Exp $	*/
+/*	$OpenBSD: ccl.c,v 1.9 2022/12/26 19:16:01 jmc Exp $	*/

 /* ccl - routines for character classes */

@ -134,7 +134,7 @@ ccl_set_diff(int a, int b)

 	/*
 	 * In order to handle negation, we spin through all possible chars,
-	 * addding each char in a that is not in b. (This could be O(n^2),
+	 * adding each char in a that is not in b. (This could be O(n^2),
 	 * but n is small and bounded.)
 	 */
 	for (ch = 0; ch < csize; ++ch)
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: flexdef.h,v 1.15 2015/11/19 23:48:06 tedu Exp $	*/
+/*	$OpenBSD: flexdef.h,v 1.16 2022/12/26 19:16:01 jmc Exp $	*/

 /* flexdef - definitions file for flex */

@ -882,7 +882,7 @@ extern void mark_defs1 PROTO ((void));
 /* Mark the current position in the action array as the end of the prolog. */
 extern void mark_prolog PROTO ((void));

-/* Generate a data statment for a two-dimensional array. */
+/* Generate a data statement for a two-dimensional array. */
 extern void mk2data PROTO ((int));

 extern void mkdata PROTO ((int));	/* generate a data statement */
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.28 2021/06/23 02:53:44 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.29 2022/12/26 19:16:01 jmc Exp $	*/

 /* flex - tool to generate fast lexical analyzers */

@ -1443,7 +1443,7 @@ readin()
 		flexend(1);

 	/*
-	 * If the user explicitly requested posix compatibility by specifing
+	 * If the user explicitly requested posix compatibility by specifying
 	 * the posix-compat option, then we check for conflicting options.
 	 * However, if the POSIXLY_CORRECT variable is set, then we quietly
 	 * make flex as posix-compatible as possible.  This is the
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.19 2015/11/19 23:34:56 mmcc Exp $	*/
+/*	$OpenBSD: misc.c,v 1.20 2022/12/26 19:16:01 jmc Exp $	*/

 /* misc - miscellaneous flex routines */

@ -696,7 +696,7 @@ otoi(str)
 }


-/* out - various flavors of outputing a (possibly formatted) string for the
+/* out - various flavors of outputting a (possibly formatted) string for the
 *	 generated scanner, keeping track of the line count.
 */

--- a/usr.bin/lex/tables.c
+++ b/usr.bin/lex/tables.c
@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.4 2017/08/17 19:27:09 tedu Exp $ */
+/* $OpenBSD: tables.c,v 1.5 2022/12/26 19:16:01 jmc Exp $ */

 /*  tables.c - tables serialization code
 *
@ -157,12 +157,12 @@ int yytbl_hdr_fwrite (struct yytbl_writer *wr, const struct yytbl_hdr *th)

 	sz = strlen (th->th_version) + 1;
 	if ((rv = yytbl_writen (wr, th->th_version, sz)) != sz)
-		flex_die (_("th_version writen failed"));
+		flex_die (_("th_version written failed"));
 	bwritten += rv;

 	sz = strlen (th->th_name) + 1;
 	if ((rv = yytbl_writen (wr, th->th_name, sz)) != sz)
-		flex_die (_("th_name writen failed"));
+		flex_die (_("th_name written failed"));
 	bwritten += rv;

 	/* add padding */
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: tblcmp.c,v 1.10 2015/11/19 23:34:56 mmcc Exp $	*/
+/*	$OpenBSD: tblcmp.c,v 1.11 2022/12/26 19:16:01 jmc Exp $	*/

 /* tblcmp - table compression routines */

@ -511,7 +511,7 @@ mkdeftbl()
 * (i.e., jam entries) into the table.  It is assumed that by linking to
 * "JAMSTATE" they will be taken care of.  In any case, entries in "state"
 * marking transitions to "SAME_TRANS" are treated as though they will be
- * taken care of by whereever "deflink" points.  "totaltrans" is the total
+ * taken care of by wherever "deflink" points.  "totaltrans" is the total
 * number of transitions out of the state.  If it is below a certain threshold,
 * the tables are searched for an interior spot that will accommodate the
 * state array.
--- a/usr.bin/libtool/LT/UList.pm
+++ b/usr.bin/libtool/LT/UList.pm
@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: UList.pm,v 1.4 2017/07/23 09:47:11 zhuk Exp $
+# $OpenBSD: UList.pm,v 1.5 2022/12/26 19:16:01 jmc Exp $
 #
 # Copyright (c) 2013 Vadim Zhukov <zhuk@openbsd.org>
 #
@ -38,7 +38,7 @@ sub _translate_num_key($$;$) {
 	die "invalid index $_[1]" if $_[1] - int($_[2] // 0) >= @{$_[0]};
 }

-# Construct new UList and returnes reference to the array,
+# Construct new UList and returns reference to the array,
 # not to the tied object itself.
 sub new {
 	my $class = shift;
@ -150,7 +150,7 @@ sub SPLICE
 		$length = $maxrm;
 	}

-	# trailing elemenets positions to be renumbered by adding $delta
+	# trailing elements positions to be renumbered by adding $delta
 	my $delta = -$length;

 	#
--- a/usr.bin/m4/TEST/test.m4
+++ b/usr.bin/m4/TEST/test.m4
@ -1,4 +1,4 @@
-#	$OpenBSD: test.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
+#	$OpenBSD: test.m4,v 1.4 2022/12/26 19:16:01 jmc Exp $
 #	$NetBSD: test.m4,v 1.4 1995/09/28 05:38:05 tls Exp $
 #
 # Copyright (c) 1989, 1993
@ -209,7 +209,7 @@ smaller ones.  In either case, new spells must be found.
     
 If all existing dragons are quiet (i.e. have eaten sufficiently), wizards
 have time to do other things.  They hide in castles and practice spells and
-incatations.  They also devise shortcuts for travelers and new laws of
+incantations.  They also devise shortcuts for travelers and new laws of
 transformation.
     
 Changes in the Kingdom
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: eval.c,v 1.78 2019/06/28 05:35:34 deraadt Exp $	*/
+/*	$OpenBSD: eval.c,v 1.79 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/

 /*
@ -912,7 +912,7 @@ dosub(const char *argv[], int argc)
 * function of ICON 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. 
+ * which means that those characters disappear altogether. 
 */
 static void
 map(char *dest, const char *src, const char *from, const char *to)
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: mdef.h,v 1.33 2015/11/03 16:21:47 deraadt Exp $	*/
+/*	$OpenBSD: mdef.h,v 1.34 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $	*/

 /*
@ -166,7 +166,7 @@ struct input_file {
 #define CURRENT_NAME	(infile[ilevel].name)
 #define CURRENT_LINE	(infile[ilevel].lineno)
 /*
- * macros for readibility and/or speed
+ * macros for readability and/or speed
 *
 *      gpbc()  - get a possibly pushed-back character
 *      pushf() - push a call frame entry onto stack
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: fio.c,v 1.38 2019/06/28 13:35:01 deraadt Exp $	*/
+/*	$OpenBSD: fio.c,v 1.39 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $	*/

 /*
@ -451,7 +451,7 @@ expand(char *name)
 	if (strpbrk(name, "~{[*?\\") == NULL)
 		return(savestr(name));

-	/* XXX - does not expand enviroment variables. */
+	/* XXX - does not expand environment variables. */
 	switch (glob(name, flags, NULL, &names)) {
 	case 0:
 		if (names.gl_pathc == 1)
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.1 2020/12/15 00:50:01 daniel Exp $	*/
+/*	$OpenBSD: util.c,v 1.2 2022/12/26 19:16:01 jmc Exp $	*/
 /*	$NetBSD: aux.c,v 1.5 1997/05/13 06:15:52 mikel Exp $	*/

 /*
@ -570,7 +570,7 @@ newname:
 }

 /*
- * Count the occurances of c in str
+ * Count the occurrences of c in str
 */
 int
 charcount(char *str, int c)
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: arch.c,v 1.91 2020/01/13 13:54:44 espie Exp $ */
+/*	$OpenBSD: arch.c,v 1.92 2022/12/26 19:16:02 jmc Exp $ */
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/

 /*
@ -432,7 +432,7 @@ read_archive(const char *archive, const char *earchive)

 			(void)memcpy(memberName, arHeader.ar_name,
 			    AR_NAME_SIZE);
-			/* Find real end of name (strip extranous ' ')  */
+			/* Find real end of name (strip extraneous ' ')  */
 			for (cp = memberName + AR_NAME_SIZE - 1; *cp == ' ';)
 				cp--;
 			cp[1] = '\0';
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: job.c,v 1.162 2020/06/02 12:24:44 espie Exp $	*/
+/*	$OpenBSD: job.c,v 1.163 2022/12/26 19:16:02 jmc Exp $	*/
 /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/

 /*
@ -745,7 +745,7 @@ reap_finished_job(pid_t pid)

 /*
 * classic waitpid handler: retrieve as many dead children as possible.
- * returns true if succesful
+ * returns true if successful
 */
 static bool
 reap_jobs(void)
--- a/usr.bin/make/lst.lib/lstConcatDestroy.c
+++ b/usr.bin/make/lst.lib/lstConcatDestroy.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: lstConcatDestroy.c,v 1.11 2010/07/19 19:46:44 espie Exp $	*/
+/*	$OpenBSD: lstConcatDestroy.c,v 1.12 2022/12/26 19:16:02 jmc Exp $	*/
 /*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/

 /*
@ -35,7 +35,7 @@

 /*-
 * listConcat.c --
- *	Function to concatentate two lists.
+ *	Function to concatenate two lists.
 */

 #include    "lstInt.h"
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@ -1,4 +1,4 @@
-/* $OpenBSD: cgi.c,v 1.119 2022/07/06 17:19:57 schwarze Exp $ */
+/* $OpenBSD: cgi.c,v 1.120 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2014-2019, 2021, 2022 Ingo Schwarze <schwarze@usta.de>
 * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
@ -1092,7 +1092,7 @@ main(void)

 	/*
 	 * The "rpath" pledge could be revoked after mparse_readfd()
-	 * if the file desciptor to "/footer.html" would be opened
+	 * if the file descriptor to "/footer.html" would be opened
 	 * up front, but it's probably not worth the complication
 	 * of the code it would cause: it would require scattering
 	 * pledge() calls in multiple low-level resp_*() functions.
--- a/usr.bin/mandoc/dba_read.c
+++ b/usr.bin/mandoc/dba_read.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: dba_read.c,v 1.4 2016/08/17 20:46:06 schwarze Exp $ */
+/*	$OpenBSD: dba_read.c,v 1.5 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 *
@ -17,7 +17,7 @@
 * Function to read the mandoc database from disk into RAM,
 * such that data can be added or removed.
 * The interface is defined in "dba.h".
- * This file is seperate from dba.c because this also uses "dbm.h".
+ * This file is separate from dba.c because this also uses "dbm.h".
 */
 #include <regex.h>
 #include <stdint.h>
--- a/usr.bin/mandoc/eqn.c
+++ b/usr.bin/mandoc/eqn.c
@ -1,4 +1,4 @@
-/* $OpenBSD: eqn.c,v 1.48 2022/04/13 20:19:18 schwarze Exp $ */
+/* $OpenBSD: eqn.c,v 1.49 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2014, 2015, 2017, 2018, 2020, 2022
 *               Ingo Schwarze <schwarze@openbsd.org>
@ -354,7 +354,7 @@ eqn_def_find(struct eqn_node *ep)
 /*
 * Parse a token from the input text.  The modes are:
 * MODE_QUOTED: Use *ep->start as the delimiter; the token ends
- *   before its next occurence.  Do not interpret the token in any
+ *   before its next occurrence.  Do not interpret the token in any
 *   way and return EQN_TOK_QUOTED.  All other modes behave like
 *   MODE_QUOTED when *ep->start is '"'.
 * MODE_NOSUB: If *ep->start is a curly brace, the token ends after it;
--- a/usr.bin/mandoc/mandocdb.c
+++ b/usr.bin/mandoc/mandocdb.c
@ -1,4 +1,4 @@
-/* $OpenBSD: mandocdb.c,v 1.218 2021/10/24 21:24:16 deraadt Exp $ */
+/* $OpenBSD: mandocdb.c,v 1.219 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2011-2020 Ingo Schwarze <schwarze@openbsd.org>
 * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
@ -764,7 +764,7 @@ filescan(const char *infile)
 	 * We have to do lstat(2) before realpath(3) loses
 	 * the information whether this is a symbolic link.
 	 * We need to know that because for symbolic links,
-	 * we want to use the orginal file name, while for
+	 * we want to use the original file name, while for
 	 * regular files, we want to use the real path.
 	 */
 	if (lstat(infile, &st) == -1) {
--- a/usr.bin/mandoc/mansearch.c
+++ b/usr.bin/mandoc/mansearch.c
@ -1,4 +1,4 @@
-/* $OpenBSD: mansearch.c,v 1.66 2022/01/13 04:06:10 schwarze Exp $ */
+/* $OpenBSD: mansearch.c,v 1.67 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 * Copyright (c) 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
@ -488,7 +488,7 @@ lstlen(const char *cp, size_t sep)

 /*
 * Print the NUL-terminated list of NUL-terminated strings
- * into the buffer, seperating strings with sep.
+ * into the buffer, separating strings with sep.
 */
 static void
 lstcat(char *buf, size_t *i, const char *cp, const char *sep)
--- a/usr.bin/mandoc/mdoc_man.c
+++ b/usr.bin/mandoc/mdoc_man.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: mdoc_man.c,v 1.135 2021/07/04 15:38:09 schwarze Exp $ */
+/*	$OpenBSD: mdoc_man.c,v 1.136 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2011-2021 Ingo Schwarze <schwarze@openbsd.org>
 *
@ -1516,7 +1516,7 @@ mid_it(void)
 	    Bl_stack[Bl_stack_len - 1]);
 	print_word(buf);

-	/* Remeber to close out this .RS block later. */
+	/* Remember to close out this .RS block later. */
 	Bl_stack_post[Bl_stack_len - 1] = 1;
 }

--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@ -1,4 +1,4 @@
-/* $OpenBSD: roff.c,v 1.267 2022/08/16 17:29:18 schwarze Exp $ */
+/* $OpenBSD: roff.c,v 1.268 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2010-2015, 2017-2022 Ingo Schwarze <schwarze@openbsd.org>
 * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@ -1447,7 +1447,7 @@ roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char ec)
 				break;

 			/*
-			 * If not overriden,
+			 * If not overridden,
 			 * let \*(.T through to the formatters.
 			 */

@ -2477,7 +2477,7 @@ roff_getnum(const char *v, int *pos, int *res, int flags)
 * Evaluate a string comparison condition.
 * The first character is the delimiter.
 * Succeed if the string up to its second occurrence
- * matches the string up to its third occurence.
+ * matches the string up to its third occurrence.
 * Advance the cursor after the third occurrence
 * or lacking that, to the end of the line.
 */
@ -4369,7 +4369,7 @@ roff_getformat(const struct roff *r)
 * return zero and don't change the current position.
 * If the control character has been set with `.cc', then let that grain
 * precedence.
- * This is slighly contrary to groff, where using the non-breaking
+ * This is slightly contrary to groff, where using the non-breaking
 * control character when `cc' has been invoked will cause the
 * non-breaking macro contents to be printed verbatim.
 */
--- a/usr.bin/mandoc/roff_term.c
+++ b/usr.bin/mandoc/roff_term.c
@ -1,4 +1,4 @@
-/* $OpenBSD: roff_term.c,v 1.22 2021/08/10 12:36:42 schwarze Exp $ */
+/* $OpenBSD: roff_term.c,v 1.23 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2010,2014,2015,2017-2020 Ingo Schwarze <schwarze@openbsd.org>
 *
@ -173,7 +173,7 @@ roff_term_pre_po(ROFF_TERM_ARGS)
 	} else
 		ponew = polast;

-	/* Remeber both the previous and the newly requested offset. */
+	/* Remember both the previous and the newly requested offset. */
 	polast = po;
 	po = ponew;

--- a/usr.bin/mandoc/term.c
+++ b/usr.bin/mandoc/term.c
@ -1,4 +1,4 @@
-/* $OpenBSD: term.c,v 1.150 2022/08/16 17:44:53 schwarze Exp $ */
+/* $OpenBSD: term.c,v 1.151 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2010-2022 Ingo Schwarze <schwarze@openbsd.org>
 * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@ -192,7 +192,7 @@ term_flushln(struct termp *p)
 			break;

 		/*
-		 * At the location of an automtic line break, input
+		 * At the location of an automatic line break, input
 		 * space characters are consumed by the line break.
 		 */

--- a/usr.bin/mg/cmode.c
+++ b/usr.bin/mg/cmode.c
@ -1,4 +1,4 @@
-/* $OpenBSD: cmode.c,v 1.19 2022/10/15 09:54:29 op Exp $ */
+/* $OpenBSD: cmode.c,v 1.20 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * This file is in the public domain.
 *
@ -213,7 +213,7 @@ cc_lfindent(int f, int n)
 }

 /*
- * Get the level of indention after line lp is processed
+ * Get the level of indentation after line lp is processed
 * Note getindent has two returns:
 * curi = value if indenting current line.
 * return value = value affecting subsequent lines.
@ -227,7 +227,7 @@ getindent(const struct line *lp, int *curi)
 	int newind = 0;		/* new index value */
 	int stringp = FALSE;	/* in string? */
 	int escp = FALSE;	/* Escape char? */
-	int lastc = '\0';	/* Last matched string delimeter */
+	int lastc = '\0';	/* Last matched string delimiter */
 	int nparen = 0;		/* paren count */
 	int obrace = 0;		/* open brace count */
 	int cbrace = 0;		/* close brace count */
@ -356,7 +356,7 @@ getindent(const struct line *lp, int *curi)
 }

 /*
- * Given a delimeter and its purported mate, tell us if they
+ * Given a delimiter and its purported mate, tell us if they
 * match.
 */
 static int
--- a/usr.bin/mg/display.c
+++ b/usr.bin/mg/display.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.48 2017/07/06 19:27:37 schwarze Exp $	*/
+/*	$OpenBSD: display.c,v 1.49 2022/12/26 19:16:02 jmc Exp $	*/

 /* This file is in the public domain. */

@ -38,7 +38,7 @@ struct video {

 #define VFCHG	0x0001			/* Changed.			 */
 #define VFHBAD	0x0002			/* Hash and cost are bad.	 */
-#define VFEXT	0x0004			/* extended line (beond ncol)	 */
+#define VFEXT	0x0004			/* extended line (beyond ncol)	 */

 /*
 * SCORE structures hold the optimal
@ -685,7 +685,7 @@ updext(int currow, int curcol)
 	lbound = curcol - (curcol % (ncol >> 1)) - (ncol >> 2);

 	/*
-	 * scan through the line outputing characters to the virtual screen
+	 * scan through the line outputting characters to the virtual screen
 	 * once we reach the left edge
 	 */
 	vtmove(currow, -lbound);		/* start scanning offscreen */
--- a/usr.bin/mg/extend.c
+++ b/usr.bin/mg/extend.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: extend.c,v 1.75 2021/05/06 14:16:12 lum Exp $	*/
+/*	$OpenBSD: extend.c,v 1.76 2022/12/26 19:16:02 jmc Exp $	*/
 /* This file is in the public domain. */

 /*
@ -661,7 +661,7 @@ load(const char *fname)
 		return (FALSE);
 	}

-	/* keep a note of fname incase of errors in loaded file. */
+	/* keep a note of fname in case of errors in loaded file. */
 	(void)strlcpy(fncpy, fname, sizeof(fncpy));
 	line = 0;
 	while ((s = ffgetline(ffp, excbuf, sizeof(excbuf) - 1, &nbytes))
--- a/usr.bin/mg/funmap.c
+++ b/usr.bin/mg/funmap.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: funmap.c,v 1.64 2022/10/20 18:59:24 op Exp $	*/
+/*	$OpenBSD: funmap.c,v 1.65 2022/12/26 19:16:02 jmc Exp $	*/

 /* This file is in the public domain */

@ -34,7 +34,7 @@ static struct funmap *funs;
 *  0 = a toggle, non-modifiable insert/delete, region modifier, etc
 *  1 = value can be string or number value (like: file/buf name, search string)
 *  2 = multiple type value required, see auto-execute, or global-set-key, etc
- * -1 = error: interactive commmand, unsuitable for interpreter
+ * -1 = error: interactive command, unsuitable for interpreter
 *
 * Some functions when used interactively may ask for a 'y' or 'n' (or another
 * character) to continue, in excline, a 'y' is assumed. Functions like this
--- a/usr.bin/mg/kbd.c
+++ b/usr.bin/mg/kbd.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: kbd.c,v 1.35 2021/03/01 10:51:14 lum Exp $	*/
+/*	$OpenBSD: kbd.c,v 1.36 2022/12/26 19:16:02 jmc Exp $	*/

 /* This file is in the public domain. */

@ -438,7 +438,7 @@ quote(int f, int n)
 }

 /*
- * Wraper function to count invocation repeats.
+ * Wrapper function to count invocation repeats.
 * We ignore any function whose sole purpose is to get us
 * to the intended function.
 */
--- a/usr.bin/mg/log.c
+++ b/usr.bin/mg/log.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.12 2021/03/02 13:06:50 lum Exp $	*/
+/*	$OpenBSD: log.c,v 1.13 2022/12/26 19:16:02 jmc Exp $	*/

 /* 
 * This file is in the public domain.
@ -16,7 +16,7 @@
 * amend the 'Makefile' for that to happen. Because of this, the code
 * is subject to bit-rot. However, I know myself and others have 
 * written similar functionally often enough, that recording the below 
- * in a code repository could aid the developement efforts of mg, even
+ * in a code repository could aid the development efforts of mg, even
 * if it requires a bit of effort to get working. The current code is
 * written in the spirit of debugging (quickly and perhaps not ideal,
 * but it does what is required well enough). Should debugging become
--- a/usr.bin/mg/macro.c
+++ b/usr.bin/mg/macro.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: macro.c,v 1.16 2015/03/19 21:22:15 bcallah Exp $	*/
+/*	$OpenBSD: macro.c,v 1.17 2022/12/26 19:16:02 jmc Exp $	*/

 /* This file is in the public domain. */

@ -15,7 +15,7 @@
 #include "key.h"
 #include "macro.h"

-int inmacro = FALSE;	/* Macro playback in progess */
+int inmacro = FALSE;	/* Macro playback in progress */
 int macrodef = FALSE;	/* Macro recording in progress */
 int macrocount = 0;

--- a/usr.bin/mg/search.c
+++ b/usr.bin/mg/search.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.48 2022/10/20 18:59:24 op Exp $	*/
+/*	$OpenBSD: search.c,v 1.49 2022/12/26 19:16:02 jmc Exp $	*/

 /* This file is in the public domain. */

@ -872,8 +872,8 @@ zapuptochar(int f, int n)
 }

 /*
- * Prompt for a charcter and deletes from the point up to, optionally
- * including, the first instance of that charcters.  Marks is cleared
+ * Prompt for a character and deletes from the point up to, optionally
+ * including, the first instance of that character.  Marks is cleared
 * afterwards.
 */
 int
--- a/usr.bin/mg/tags.c
+++ b/usr.bin/mg/tags.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: tags.c,v 1.17 2022/01/28 06:18:41 guenther Exp $	*/
+/*	$OpenBSD: tags.c,v 1.18 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * This file is in the public domain.
@ -463,7 +463,7 @@ curtoken(int f, int n, char *token)
 	odoto = curwp->w_doto;
 	odotline = curwp->w_dotline;
 	
-	/* Move backword unless we are at the beginning of a word or at
+	/* Move backward unless we are at the beginning of a word or at
 	 * beginning of line.
 	 */
 	if (!atbow())
--- a/usr.bin/mg/word.c
+++ b/usr.bin/mg/word.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: word.c,v 1.19 2015/12/30 20:51:51 lum Exp $	*/
+/*	$OpenBSD: word.c,v 1.20 2022/12/26 19:16:02 jmc Exp $	*/

 /* This file is in the public domain. */

@ -70,7 +70,7 @@ forwword(int f, int n)

 /*
 * Transpose 2 words. 
- * The function below is artifically restricted to only a maximum of 1 iteration
+ * The function below is artificially restricted to only a maximum of 1 iteration
 * at the moment because the 'undo' functionality within mg needs amended for
 * multiple movements of point, backwards and forwards.
 */
--- a/usr.bin/patch/pch.c
+++ b/usr.bin/patch/pch.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: pch.c,v 1.62 2019/12/02 22:23:19 jca Exp $	*/
+/*	$OpenBSD: pch.c,v 1.63 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * patch - a program to apply diffs to original files
@ -495,7 +495,7 @@ another_hunk(void)
 	LINENUM	fillcnt;			/* #lines of missing ptrn or repl */
 	LINENUM	fillsrc;			/* index of first line to copy */
 	LINENUM	filldst;			/* index of first missing line */
-	bool	ptrn_spaces_eaten;		/* ptrn was slightly misformed */
+	bool	ptrn_spaces_eaten;		/* ptrn was slightly malformed */
 	bool	repl_could_be_missing;		/* no + or ! lines in this hunk */
 	bool	repl_missing;			/* we are now backtracking */
 	off_t	repl_backtrack_position;	/* file pos of first repl line */
--- a/usr.bin/rdist/child.c
+++ b/usr.bin/rdist/child.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: child.c,v 1.27 2019/06/28 13:35:03 deraadt Exp $	*/
+/*	$OpenBSD: child.c,v 1.28 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * Copyright (c) 1983 Regents of the University of California.
@ -469,7 +469,7 @@ spawn(struct cmd *cmd, struct cmd *cmdlist)
 		/* Receive notification when the child exits */
 		(void) signal(SIGCHLD, reap);

-		/* Settup the new child */
+		/* Setup the new child */
 		newchild.c_next = NULL;
 		newchild.c_name = childname;
 		newchild.c_readfd = fildes[PIPE_READ];
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.40 2019/06/28 13:35:03 deraadt Exp $	*/
+/*	$OpenBSD: common.c,v 1.41 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * Copyright (c) 1983 Regents of the University of California.
@ -168,7 +168,7 @@ finish(void)

 		if (!setjmp_ok) {
 #ifdef DEBUG_SETJMP
-			error("attemping longjmp() without target");
+			error("attempting longjmp() without target");
 			abort();
 #else
 			exit(1);
--- a/usr.bin/rdist/config.h
+++ b/usr.bin/rdist/config.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.13 2015/01/21 04:08:37 guenther Exp $	*/
+/*	$OpenBSD: config.h,v 1.14 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * Copyright (c) 1993 Michael A. Cooper
@ -58,7 +58,7 @@
 /*
 * Syslog levels.  Define these to match the levels you want to log
 * via syslog().  These are defined in <syslog.h>.  If you don't want
- * a particuliar level logged _ever_, undefine it.  What is logged is
+ * a particular level logged _ever_, undefine it.  What is logged is
 * usually controlled via command line options, so you normally should
 * not need to undefine these.
 */
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.48 2022/01/28 06:18:42 guenther Exp $	*/
+/*	$OpenBSD: server.c,v 1.49 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * Copyright (c) 1983 Regents of the University of California.
@ -54,8 +54,8 @@ char	*ptarget;		/* pointer to end of target name */
 int	catname = 0;		/* cat name to target name */
 char	*sptarget[32];		/* stack of saved ptarget's for directories */
 char   *fromhost = NULL;	/* Client hostname */
-static int64_t min_freespace = 0; /* Minimium free space on a filesystem */
-static int64_t min_freefiles = 0; /* Minimium free # files on a filesystem */
+static int64_t min_freespace = 0; /* Minimum free space on a filesystem */
+static int64_t min_freefiles = 0; /* Minimum free # files on a filesystem */
 int	oumask;			/* Old umask */

 static int cattarget(char *);
@ -1275,8 +1275,8 @@ hardlink(char *cmd)
 *
 * A key letter is followed immediately by the value
 * to set.  The keys are:
- *	SC_FREESPACE	- Set minimium free space of filesystem
- *	SC_FREEFILES	- Set minimium free number of files of filesystem
+ *	SC_FREESPACE	- Set minimum free space of filesystem
+ *	SC_FREEFILES	- Set minimum free number of files of filesystem
 */
 static void
 setconfig(char *cmd)
@ -1297,14 +1297,14 @@ setconfig(char *cmd)
 		}
 		break;

-	case SC_FREESPACE: 	/* Minimium free space */
+	case SC_FREESPACE: 	/* Minimum free space */
 		min_freespace = (int64_t)strtonum(cp, 0, LLONG_MAX, &errstr);
 		if (errstr)
 			fatalerr("Minimum free space is %s: '%s'", errstr,
 				optarg);
 		break;

-	case SC_FREEFILES: 	/* Minimium free files */
+	case SC_FREEFILES: 	/* Minimum free files */
 		min_freefiles = (int64_t)strtonum(cp, 0, LLONG_MAX, &errstr);
 		if (errstr)
 			fatalerr("Minimum free files is %s: '%s'", errstr,
--- a/usr.bin/rsync/copy.c
+++ b/usr.bin/rsync/copy.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: copy.c,v 1.3 2021/11/28 19:28:42 deraadt Exp $ */
+/*	$OpenBSD: copy.c,v 1.4 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
 *
@ -27,7 +27,7 @@

 /*
 * Return true if all bytes in buffer are zero.
- * A buffer of zero lenght is also considered a zero buffer.
+ * A buffer of zero length is also considered a zero buffer.
 */
 static int
 iszero(const void *b, size_t len)
--- a/usr.bin/rsync/flist.c
+++ b/usr.bin/rsync/flist.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: flist.c,v 1.36 2021/11/03 14:42:12 deraadt Exp $ */
+/*	$OpenBSD: flist.c,v 1.37 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 * Copyright (c) 2019 Florian Obser <florian@openbsd.org>
@ -34,7 +34,7 @@
 /*
 * We allocate our file list in chunk sizes so as not to do it one by
 * one.
- * Preferrably we get one or two allocation.
+ * Preferably we get one or two allocation.
 */
 #define	FLIST_CHUNK_SIZE (1024)

--- a/usr.bin/rsync/io.c
+++ b/usr.bin/rsync/io.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.22 2022/04/12 14:51:04 claudio Exp $ */
+/*	$OpenBSD: io.c,v 1.23 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 *
@ -164,7 +164,7 @@ io_write_buf(struct sess *sess, int fd, const void *buf, size_t sz)

 /*
 * Write "line" (NUL-terminated) followed by a newline.
- * Returns zero on failure, non-zero on succcess.
+ * Returns zero on failure, non-zero on success.
 */
 int
 io_write_line(struct sess *sess, int fd, const char *line)
@ -468,7 +468,7 @@ io_buffer_buf(void *buf, size_t *bufpos, size_t buflen, const void *val,
 }

 /*
- * Like io_buffer_buf(), but also accomodating for multiplexing codes.
+ * Like io_buffer_buf(), but also accommodating for multiplexing codes.
 * This should NEVER be passed to io_write_buf(), but instead passed
 * directly to a write operation.
 */
@ -502,7 +502,7 @@ io_lowbuffer_buf(struct sess *sess, void *buf,
 *   io_lowbuffer_alloc(... sizeof(int32_t));
 *   io_lowbuffer_int(...);
 * And not sizeof(int32_t) * 2 or whatnot.
- * Returns zero on failure, non-zero on succes.
+ * Returns zero on failure, non-zero on success.
 */
 int
 io_lowbuffer_alloc(struct sess *sess, void **buf,
--- a/usr.bin/rsync/rmatch.c
+++ b/usr.bin/rsync/rmatch.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: rmatch.c,v 1.2 2021/08/29 15:37:58 claudio Exp $	*/
+/*	$OpenBSD: rmatch.c,v 1.3 2022/12/26 19:16:02 jmc Exp $	*/

 /*
 * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@ -126,7 +126,7 @@ rangematch(const char **pp, char test)
 			case RANGE_NOMATCH:
 				continue;
 			default:
-				/* invalid character class, treat litterally. */
+				/* invalid character class, treat literally. */
 				break;
 			}
 		}
@ -156,7 +156,7 @@ rangematch(const char **pp, char test)

 /*
 * Single character match, advances pattern as much as needed.
- * Return 0 on match and !0 (aka 1) on missmatch.
+ * Return 0 on match and !0 (aka 1) on mismatch.
 * When matched pp is advanced to the end of the pattern matched.
 */
 static int
--- a/usr.bin/rsync/rules.c
+++ b/usr.bin/rsync/rules.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: rules.c,v 1.4 2021/11/03 14:42:12 deraadt Exp $ */
+/*	$OpenBSD: rules.c,v 1.5 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
 *
@ -211,7 +211,7 @@ parse_rule(char *line, enum rule_type def)
 		/* comment */
 		return 0;
 	case '\0':
-		/* ingore empty lines */
+		/* ignore empty lines */
 		return 0;
 	default:
 		len = strcspn(line, " _");
--- a/usr.bin/rsync/socket.c
+++ b/usr.bin/rsync/socket.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: socket.c,v 1.32 2022/08/02 18:09:20 job Exp $ */
+/*	$OpenBSD: socket.c,v 1.33 2022/12/26 19:16:02 jmc Exp $ */
 /*
 * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 *
@ -46,7 +46,7 @@ struct	source {
 };

 /*
- * Try to bind to a local IP address matching the addres family passed.
+ * Try to bind to a local IP address matching the address family passed.
 * Return -1 on failure to bind to any address, 0 on success.
 */
 static int
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: compile.c,v 1.50 2018/12/07 14:45:40 schwarze Exp $	*/
+/*	$OpenBSD: compile.c,v 1.51 2022/12/26 19:16:02 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Diomidis Spinellis.
@ -342,7 +342,7 @@ nonsel:		/* Now parse the command */
 }

 /*
- * Get a delimited string.  P points to the delimeter of the string; d points
+ * Get a delimited string.  P points to the delimiter of the string; d points
 * to a buffer area.  Newline and delimiter escapes are processed; other
 * escapes are ignored.
 *
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.9 2017/12/13 16:06:34 millert Exp $ */
+/*	$OpenBSD: defs.h,v 1.10 2022/12/26 19:16:02 jmc Exp $ */
 /*-
 * Copyright (c) 1992 Diomidis Spinellis.
 * Copyright (c) 1992, 1993
@ -71,7 +71,7 @@ struct s_subst {

 /*
 * An internally compiled command.
- * Initialy, label references are stored in t, on a second pass they
+ * Initially, label references are stored in t, on a second pass they
 * are updated to pointers.
 */
 struct s_command {
--- a/usr.bin/sndioctl/sndioctl.c
+++ b/usr.bin/sndioctl/sndioctl.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: sndioctl.c,v 1.17 2021/12/25 16:25:07 ratchov Exp $	*/
+/*	$OpenBSD: sndioctl.c,v 1.18 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2014-2020 Alexandre Ratchov <alex@caoua.org>
 *
@ -710,7 +710,7 @@ cmd(char *line)
 			fprintf(stderr, "%s.%s: expects value\n", astr, func);
 			exit(1);
 		}
-		/* FALLTROUGH */
+		/* FALLTHROUGH */
 	case SIOCTL_VEC:
 	case SIOCTL_LIST:
 		for (i = g; i != NULL; i = nextpar(i)) {
--- a/usr.bin/sndiod/abuf.c
+++ b/usr.bin/sndiod/abuf.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: abuf.c,v 1.4 2016/01/08 16:17:31 ratchov Exp $	*/
+/*	$OpenBSD: abuf.c,v 1.5 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -82,7 +82,7 @@ abuf_rgetblk(struct abuf *buf, int *rsize)
 }

 /*
- * discard "count" bytes at the start postion.
+ * discard "count" bytes at the start position.
 */
 void
 abuf_rdiscard(struct abuf *buf, int count)
--- a/usr.bin/sndiod/dev.c
+++ b/usr.bin/sndiod/dev.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: dev.c,v 1.105 2022/04/29 09:12:57 ratchov Exp $	*/
+/*	$OpenBSD: dev.c,v 1.106 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -1929,7 +1929,7 @@ slot_attach(struct slot *s)
 	}

 	/*
-	 * setup converions layer
+	 * setup conversions layer
 	 */
 	slot_initconv(s);

@ -2334,7 +2334,7 @@ ctlslot_update(struct ctlslot *s)
 		/* nothing to do if no visibility change */
 		if (((c->refs_mask & s->self) ^ refs_mask) == 0)
 			continue;
-		/* if control becomes visble */
+		/* if control becomes visible */
 		if (refs_mask)
 			c->refs_mask |= s->self;
 		/* if control is hidden */
@ -2548,7 +2548,7 @@ ctl_update(struct ctl *c)
 		/* nothing to do if no visibility change */
 		if (((c->refs_mask & s->self) ^ refs_mask) == 0)
 			continue;
-		/* if control becomes visble */
+		/* if control becomes visible */
 		if (refs_mask)
 			c->refs_mask |= s->self;
 		/* if control is hidden */
--- a/usr.bin/sndiod/dev.h
+++ b/usr.bin/sndiod/dev.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: dev.h,v 1.42 2022/04/29 09:12:57 ratchov Exp $	*/
+/*	$OpenBSD: dev.h,v 1.43 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -155,7 +155,7 @@ struct ctl {
 	} u;

 	unsigned int addr;		/* slot side control address */
-#define CTL_NAMEMAX	16		/* max name lenght */
+#define CTL_NAMEMAX	16		/* max name length */
 	char func[CTL_NAMEMAX];		/* parameter function name */
 	char group[CTL_NAMEMAX];	/* group aka namespace */
 	struct ctl_node {
--- a/usr.bin/sndiod/dsp.h
+++ b/usr.bin/sndiod/dsp.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: dsp.h,v 1.11 2022/03/07 08:58:33 ratchov Exp $	*/
+/*	$OpenBSD: dsp.h,v 1.12 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -61,7 +61,7 @@ typedef int adata_t;
 #define RESAMP_RATIO		64

 /*
- * Maximum size of the encording string (the longest possible
+ * Maximum size of the encoding string (the longest possible
 * encoding is ``s24le3msb'').
 */
 #define ENCMAX	10
--- a/usr.bin/sndiod/file.c
+++ b/usr.bin/sndiod/file.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.25 2019/11/27 08:18:22 ratchov Exp $	*/
+/*	$OpenBSD: file.c,v 1.26 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -40,7 +40,7 @@
 *	from the callback
 *
 *	the timeout can be aborted with timo_del(), it is OK to try to
- *	abort a timout that has expired
+ *	abort a timeout that has expired
 *
 */

@ -143,7 +143,7 @@ timo_del(struct timo *o)

 /*
 * routine to be called by the timer when 'delta' 24-th of microsecond
- * elapsed. This routine updates time referece used by timeouts and
+ * elapsed. This routine updates time reference used by timeouts and
 * calls expired timeouts
 */
 void
--- a/usr.bin/sndiod/sock.c
+++ b/usr.bin/sndiod/sock.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: sock.c,v 1.46 2022/04/29 08:30:48 ratchov Exp $	*/
+/*	$OpenBSD: sock.c,v 1.47 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
 *
@ -834,7 +834,7 @@ sock_auth(struct sock *f)
 	gid_t egid;

 	/*
-	 * root bypasses any authenication checks and has no session
+	 * root bypasses any authentication checks and has no session
 	 */
 	if (getpeereid(f->fd, &euid, &egid) == 0 && euid == 0) {
 		f->pstate = SOCK_HELLO;
--- a/usr.bin/sndiod/sysex.h
+++ b/usr.bin/sndiod/sysex.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: sysex.h,v 1.2 2013/12/20 08:47:37 ratchov Exp $	*/
+/*	$OpenBSD: sysex.h,v 1.3 2022/12/26 19:16:03 jmc Exp $	*/
 /*
 * Copyright (c) 2011 Alexandre Ratchov <alex@caoua.org>
 *
@ -46,7 +46,7 @@
 #define   SYSEX_MMC_LOC_CMD	0x01

 /*
- * sepcial "any" midi device number
+ * special "any" midi device number
 */
 #define SYSEX_DEV_ANY		0x7f

--- a/usr.bin/snmp/snmpc.c
+++ b/usr.bin/snmp/snmpc.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpc.c,v 1.39 2022/12/20 20:12:27 martijn Exp $	*/
+/*	$OpenBSD: snmpc.c,v 1.40 2022/12/26 19:16:03 jmc Exp $	*/

 /*
 * Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
@ -1197,7 +1197,7 @@ snmpc_printerror(enum snmp_error error, struct ber_element *varbind,
 	case SNMP_ERROR_COMMITFAILED:
 		errx(1, "Can't parse oid %s: Commit failed", oid);
 	case SNMP_ERROR_UNDOFAILED:
-		errx(1, "Can't parse oid %s: Undo faild", oid);
+		errx(1, "Can't parse oid %s: Undo failed", oid);
 	case SNMP_ERROR_AUTHERROR:
 		errx(1, "Can't parse oid %s: Authorization error", oid);
 	case SNMP_ERROR_NOTWRITABLE:
--- a/usr.bin/spell/spellprog.c
+++ b/usr.bin/spell/spellprog.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: spellprog.c,v 1.15 2021/10/24 21:24:17 deraadt Exp $	*/
+/*	$OpenBSD: spellprog.c,v 1.16 2022/12/26 19:16:03 jmc Exp $	*/

 /*
 * Copyright (c) 1991, 1993
@ -225,7 +225,7 @@ char affix[40];
 * the path to a file in which to store found words.
 *
 * In normal usage, spell is called twice.  The first time it is
- * called with a stop list to flag commonly mispelled words.  The
+ * called with a stop list to flag commonly misspelled words.  The
 * remaining words are then passed to spell again, this time with
 * the dictionary file as the first (non-flag) argument.
 *
--- a/usr.bin/ssh/sntrup761.sh
+++ b/usr.bin/ssh/sntrup761.sh
@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: sntrup761.sh,v 1.5 2021/01/08 02:33:13 dtucker Exp $
+#       $OpenBSD: sntrup761.sh,v 1.6 2022/12/26 19:16:03 jmc Exp $
 #       Placed in the Public Domain.
 #
 AUTHOR="supercop-20201130/crypto_kem/sntrup761/ref/implementors"
@ -45,7 +45,7 @@ for i in $FILES; do
 	#  - remove all includes, we inline everything required.
 	#  - make functions not required elsewhere static.
 	#  - rename the functions we do use.
-	#  - remove unneccesary defines and externs.
+	#  - remove unnecessary defines and externs.
 	sed -e "/#include/d" \
 	    -e "s/crypto_kem_/crypto_kem_sntrup761_/g" \
 	    -e "s/^void /static void /g" \
--- a/usr.bin/ssh/ssh-keyscan.c
+++ b/usr.bin/ssh/ssh-keyscan.c
@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.148 2022/12/04 23:50:49 cheloha Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.149 2022/12/26 19:16:03 jmc Exp $ */
 /*
 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 *
@ -473,7 +473,7 @@ congreet(int s)

 	/*
 	 * Read the server banner as per RFC4253 section 4.2.  The "SSH-"
-	 * protocol identification string may be preceeded by an arbitarily
+	 * protocol identification string may be preceeded by an arbitrarily
 	 * large banner which we must read and ignore.  Loop while reading
 	 * newline-terminated lines until we have one starting with "SSH-".
 	 * The ID string cannot be longer than 255 characters although the
--- a/usr.bin/telnet/README
+++ b/usr.bin/telnet/README
@ -1,4 +1,4 @@
-	$OpenBSD: README,v 1.5 2014/07/19 23:50:38 guenther Exp $
+	$OpenBSD: README,v 1.6 2022/12/26 19:16:03 jmc Exp $


 The following TELNET options are supported:
@ -19,7 +19,7 @@ The following TELNET options are supported:
 		when a terminal type is received, termcap/terminfo
 		is consulted to determine if it is a known terminal
 		type.  It keeps requesting terminal types until it
-		gets one that it recongnizes, or hits the end of the
+		gets one that it recognizes, or hits the end of the
 		list.  The server side looks up the entry in the
 		termcap/terminfo data base, and generates a list of
 		names which it then passes one at a time to each
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: commands.c,v 1.87 2019/06/28 13:35:04 deraadt Exp $	*/
+/*	$OpenBSD: commands.c,v 1.88 2022/12/26 19:16:03 jmc Exp $	*/
 /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/

 /*
@ -1941,7 +1941,7 @@ static char
 	sethelp[] = 	"set operating parameters ('set ?' for more)",
 	unsethelp[] = 	"unset operating parameters ('unset ?' for more)",
 	togglestring[] ="toggle operating parameters ('toggle ?' for more)",
-	slchelp[] =	"change state of special charaters ('slc ?' for more)",
+	slchelp[] =	"change state of special characters ('slc ?' for more)",
 	displayhelp[] =	"display operating parameters",
 	zhelp[] =	"suspend telnet",
 	envhelp[] =	"change environment variables ('environ ?' for more)",
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1187 2022/12/16 08:13:40 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1188 2022/12/26 19:16:03 jmc Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -1410,7 +1410,7 @@ struct tty {
 #define TTY_HAVEDA 0x100 /* Primary DA. */
 #define TTY_HAVEXDA 0x200
 #define TTY_SYNCING 0x400
-#define TTY_HAVEDA2 0x800 /* Seconday DA. */
+#define TTY_HAVEDA2 0x800 /* Secondary DA. */
 	int		 flags;

 	struct tty_term	*term;
--- a/usr.bin/vi/cl/cl_funcs.c
+++ b/usr.bin/vi/cl/cl_funcs.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: cl_funcs.c,v 1.22 2021/09/02 11:19:02 schwarze Exp $	*/
+/*	$OpenBSD: cl_funcs.c,v 1.23 2022/12/26 19:16:03 jmc Exp $	*/

 /*-
 * Copyright (c) 1993, 1994
@ -330,7 +330,7 @@ cl_ex_adjust(SCR *sp, exadj_t action)
 			 * displayed line was only a single glyph, and <eof>
 			 * was more than one glyph, the output would not fully
 			 * overwrite the user's input.  To fix this, output
-			 * the maxiumum character number of spaces.  Note,
+			 * the maximum character number of spaces.  Note,
 			 * this won't help if the user entered extra prompt
 			 * or <blank> characters before the command character.
 			 * We'd have to do a lot of work to make that work, and
--- a/usr.bin/vi/common/msg.c
+++ b/usr.bin/vi/common/msg.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: msg.c,v 1.27 2016/12/18 18:28:39 krw Exp $	*/
+/*	$OpenBSD: msg.c,v 1.28 2022/12/26 19:16:03 jmc Exp $	*/

 /*-
 * Copyright (c) 1991, 1993, 1994
@ -434,7 +434,7 @@ msgq_status(SCR *sp, recno_t lno, u_int flags)
 		if (db_last(sp, &last))
 			return;
 		if (last == 0) {
-			len = strlen("emptry file");
+			len = strlen("empty file");
 			memcpy(p, "empty file", len);
 			p += len;
 		} else {
--- a/usr.bin/vi/common/util.h
+++ b/usr.bin/vi/common/util.h
@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.4 2006/01/08 21:10:04 miod Exp $	*/
+/*	$OpenBSD: util.h,v 1.5 2022/12/26 19:16:03 jmc Exp $	*/

 /*-
 * Copyright (c) 1994
@ -34,7 +34,7 @@
 typedef enum { B_NONE, B_OFF, B_READ, B_RECOVER, B_SEARCH, B_WRITE } bmsg_t;

 /*
- * Number handling defines and protoypes.
+ * Number handling defines and prototypes.
 *
 * NNFITS:	test for addition of two negative numbers under a limit
 * NPFITS:	test for addition of two positive numbers under a limit
--- a/usr.bin/vi/docs/USD.doc/edit/edittut.ms
+++ b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
@ -1,4 +1,4 @@
-.\"	$OpenBSD: edittut.ms,v 1.7 2004/02/20 19:56:53 jmc Exp $
+.\"	$OpenBSD: edittut.ms,v 1.8 2022/12/26 19:16:03 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@ -847,7 +847,7 @@ uses a special notation to
 show the existence of non-printing characters.
 Suppose you had introduced the non-printing character ``control-A''
 into the word ``illustrate''
-by accidently pressing the \s-2CTRL\s0 key while
+by accidentally pressing the \s-2CTRL\s0 key while
 typing `a'.
 This can happen on many terminals
 because the \s-2CTRL\s+2 key and the `A' key
--- a/usr.bin/vi/docs/USD.doc/exref/ex.rm
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.rm
@ -1,4 +1,4 @@
-.\"	$OpenBSD: ex.rm,v 1.8 2007/11/24 12:59:28 jmc Exp $
+.\"	$OpenBSD: ex.rm,v 1.9 2022/12/26 19:16:03 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@ -363,7 +363,7 @@ It is possible to use
 in
 .I "read only"
 mode to look at files that you have no intention of modifying.
-This mode protects you from accidently overwriting the file.
+This mode protects you from accidentally overwriting the file.
 Read only mode is on when the
 .I readonly
 option is set.
@ -2002,7 +2002,7 @@ or
 preceded by a tab or a space.  This string may be anywhere in the
 line and anything after the
 .B :
-is interpeted as editor commands.  This option defaults to off because
+is interpreted as editor commands.  This option defaults to off because
 of unexpected behavior when editing files such as
 .I /etc/passwd .
 .LC
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.in
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.in
@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.in,v 1.8 2004/02/20 20:05:05 jmc Exp $
+.\"	$OpenBSD: vi.in,v 1.9 2022/12/26 19:16:03 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@ -582,7 +582,7 @@ instead of
 This will set the
 .I readonly
 option which will prevent you from
-accidently overwriting the file.
+accidentally overwriting the file.
 .sp
 .NH 1
 Making simple changes
--- a/usr.bin/vi/docs/changelog
+++ b/usr.bin/vi/docs/changelog
@ -247,7 +247,7 @@
 	+ Fix core dump if TERM wasn't set or terminal type was unknown.
 	+ Fix bug where combining ex commands that did/did not require an
 	  ex screen would overwrite the command with the want-to-continue
-	  messsage.
+	  message.
 	+ Fix bug where the screen was never resolved if the user continued
 	  entering ex commands using the : character, but then backspaced
 	  over the prompt to quit or tried to edit their colon command-line
--- a/usr.bin/vi/docs/tutorial/vi.advanced
+++ b/usr.bin/vi/docs/tutorial/vi.advanced
@ -1216,7 +1216,7 @@ Section 44.10: {lisp} default: nolisp

 Autoindent indents appropriately for lisp code, and the {(}, {)}, [{], [}],
 {[[}, and {]]} commands in open and visual modes are modified in a
-striaghtforward, intuitive fashion to have meaning for lisp.
+straightforward, intuitive fashion to have meaning for lisp.

 [Author's note: but don't ask me to define them precisely.]

--- a/usr.bin/vi/vi/v_left.c
+++ b/usr.bin/vi/vi/v_left.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: v_left.c,v 1.6 2014/11/12 04:28:41 bentley Exp $	*/
+/*	$OpenBSD: v_left.c,v 1.7 2022/12/26 19:16:04 jmc Exp $	*/

 /*-
 * Copyright (c) 1992, 1993, 1994
@ -167,7 +167,7 @@ v_first(SCR *sp, VICMD *vp)
 	/*
 	 * If moving right, non-motion commands move to the end of the range.
 	 * Delete and yank stay at the start.  Motion commands adjust the
-	 * ending point to the character before the current ending charcter.
+	 * ending point to the character before the current ending character.
 	 *
 	 * If moving left, all commands move to the end of the range.  Motion
 	 * commands adjust the starting point to the character before the
@ -229,7 +229,7 @@ v_ncol(SCR *sp, VICMD *vp)
 	/*
 	 * If moving right, non-motion commands move to the end of the range.
 	 * Delete and yank stay at the start.  Motion commands adjust the
-	 * ending point to the character before the current ending charcter.
+	 * ending point to the character before the current ending character.
 	 *
 	 * If moving left, all commands move to the end of the range.  Motion
 	 * commands adjust the starting point to the character before the
--- a/usr.bin/vi/vi/v_mark.c
+++ b/usr.bin/vi/vi/v_mark.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: v_mark.c,v 1.10 2015/03/29 01:04:23 bcallah Exp $	*/
+/*	$OpenBSD: v_mark.c,v 1.11 2022/12/26 19:16:04 jmc Exp $	*/

 /*-
 * Copyright (c) 1992, 1993, 1994
@ -186,7 +186,7 @@ mark(SCR *sp, VICMD *vp, enum which cmd)
 	 * the character before the current one (this is safe because we know
 	 * the search had to move to succeed).
 	 *
-	 * Mark motions become line mode opertions if they start at the first
+	 * Mark motions become line mode operations if they start at the first
 	 * nonblank and end at column 0 of another line.
 	 */
 	if (vp->m_start.lno < vp->m_stop.lno && vp->m_stop.cno == 0) {
--- a/usr.bin/vi/vi/v_sentence.c
+++ b/usr.bin/vi/vi/v_sentence.c
@ -1,4 +1,4 @@
-/*	$OpenBSD: v_sentence.c,v 1.7 2014/11/12 04:28:41 bentley Exp $	*/
+/*	$OpenBSD: v_sentence.c,v 1.8 2022/12/26 19:16:04 jmc Exp $	*/

 /*-
 * Copyright (c) 1992, 1993, 1994
@ -214,7 +214,7 @@ v_sentenceb(SCR *sp, VICMD *vp)
 	/*
 	 * !!!
 	 * In empty lines, skip to the previous non-white-space character.
-	 * If in text, skip to the prevous white-space character.  Believe
+	 * If in text, skip to the previous white-space character.  Believe
 	 * it or not, in the paragraph:
 	 *	ab cd.
 	 *	AB CD.
--- a/Show More
+++ b/Show More