spelling fixes; from paul tagliamonte

any parts of his diff not taken are noted on tech

107 files changed, 261 insertions, 261 deletions

diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index e39b316ebba..1dac33b2809 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -54,7 +54,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/acme-client/util.c b/usr.sbin/acme-client/util.c
index 4da5b294163..cb53440d58e 100644
--- a/usr.sbin/acme-client/util.c
+++ b/usr.sbin/acme-client/util.c
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.12 2019/06/28 13:32:46 deraadt Exp $ */
+/*	$Id: util.c,v 1.13 2022/12/28 21:30:15 jmc Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -206,7 +206,7 @@ writebuf(int fd, enum comm comm, const void *v, size_t sz)
 	/*
 	 * First, try to write the length.
 	 * If the other end of the pipe has closed, we allow the short
-	 * write to propogate as a return value of zero.
+	 * write to propagate as a return value of zero.
 	 * To detect this, catch SIGPIPE.
 	 */
 
diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c
index a2c02509263..00c8f317b1d 100644
--- a/usr.sbin/amd/amd/afs_ops.c
+++ b/usr.sbin/amd/amd/afs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: afs_ops.c,v 1.20 2021/10/21 10:55:56 deraadt Exp $	*/
+/*	$OpenBSD: afs_ops.c,v 1.21 2022/12/28 21:30:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -685,7 +685,7 @@ try_mount(void *mvp)
 	/*
 	 * If the directory is not yet made and
 	 * it needs to be made, then make it!
-	 * This may be run in a backgroun process
+	 * This may be run in a background process
 	 * in which case the flag setting won't be
 	 * noticed later - but it is set anyway
 	 * just after run_task is called.  It
diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c
index 575bacf1602..c1fce38b3a2 100644
--- a/usr.sbin/amd/amd/amq_subr.c
+++ b/usr.sbin/amd/amd/amq_subr.c
@@ -32,11 +32,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq_subr.c	8.1 (Berkeley) 6/6/93
- *	$Id: amq_subr.c,v 1.18 2015/01/21 09:50:25 guenther Exp $
+ *	$Id: amq_subr.c,v 1.19 2022/12/28 21:30:15 jmc Exp $
  */
 
 /*
- * Auxilliary routines for amq tool
+ * Auxiliary routines for amq tool
  */
 
 #include "am.h"
diff --git a/usr.sbin/amd/amd/ifs_ops.c b/usr.sbin/amd/amd/ifs_ops.c
index 615a7ab8ae9..e5bf6017e23 100644
--- a/usr.sbin/amd/amd/ifs_ops.c
+++ b/usr.sbin/amd/amd/ifs_ops.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ifs_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: ifs_ops.c,v 1.6 2017/07/28 22:41:10 fcambus Exp $
+ *	$Id: ifs_ops.c,v 1.7 2022/12/28 21:30:15 jmc Exp $
  */
 
 #include "am.h"
@@ -45,7 +45,7 @@
  *
  * This is a *gross* hack - it knows far too
  * much about the way other parts of the
- * sytem work.  See restart.c too.
+ * system work.  See restart.c too.
  */
 static char not_a_filesystem[] = "Attempting to inherit not-a-filesystem";
 /*
diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c
index cee89e94d10..73ddff26675 100644
--- a/usr.sbin/amd/amd/map.c
+++ b/usr.sbin/amd/amd/map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.c,v 1.16 2015/12/05 21:15:01 mmcc Exp $	*/
+/*	$OpenBSD: map.c,v 1.17 2022/12/28 21:30:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -877,7 +877,7 @@ free_map_if_success(int rc, int term, void *closure)
 	mf->mf_flags &= ~MFF_UNMOUNTING;
 
 	/*
-	 * If a timeout was defered because the underlying filesystem
+	 * If a timeout was deferred because the underlying filesystem
 	 * was busy then arrange for a timeout as soon as possible.
 	 */
 	if (mf->mf_flags & MFF_WANTTIMO) {
diff --git a/usr.sbin/amd/amd/wire.c b/usr.sbin/amd/amd/wire.c
index 7a137a8da04..29439bc9b06 100644
--- a/usr.sbin/amd/amd/wire.c
+++ b/usr.sbin/amd/amd/wire.c
@@ -32,13 +32,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wire.c	8.1 (Berkeley) 6/6/93
- *	$Id: wire.c,v 1.13 2014/10/24 10:29:56 schwarze Exp $
+ *	$Id: wire.c,v 1.14 2022/12/28 21:30:15 jmc Exp $
  */
 
 /*
  * This function returns the subnet (address&netmask) for the primary network
  * interface.  If the resulting address has an entry in the hosts file, the
- * corresponding name is retuned, otherwise the address is returned in
+ * corresponding name is returned, otherwise the address is returned in
  * standard internet format.
  * As a side-effect, a list of local IP/net address is recorded for use
  * by the islocalnet() function.
diff --git a/usr.sbin/amd/doc/amdref.texinfo b/usr.sbin/amd/doc/amdref.texinfo
index 762d5f2538c..a637bd8b072 100644
--- a/usr.sbin/amd/doc/amdref.texinfo
+++ b/usr.sbin/amd/doc/amdref.texinfo
@@ -36,7 +36,7 @@
 @c OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 @c
 @c	from: @(#)amdref.texinfo	8.1 (Berkeley) 6/6/93
-@c	$Id: amdref.texinfo,v 1.14 2017/08/22 16:59:40 schwarze Exp $
+@c	$Id: amdref.texinfo,v 1.15 2022/12/28 21:30:15 jmc Exp $
 @c
 @setfilename amdref.info
 @c @setfilename /usr/local/emacs/info/amd
@@ -265,7 +265,7 @@ configuration files, shell scripts and so on.
 @cindex Fileserver
 @cindex sublink
 
-@i{Amd} views the world as a set of fileservers, each containg one or
+@i{Amd} views the world as a set of fileservers, each containing one or
 more filesystems where each filesystem contains one or more
 @dfn{volumes}.  Here the term @dfn{volume} is used to refer to a
 coherent set of files such as a user's home directory or a @TeX{}
@@ -1960,7 +1960,7 @@ jsp  host!=charm;type:=nfs;rhost:=charm;rfs:=/home/charm;sublink:=jsp
 @end example
 
 The mount system call and any unmount attempts are always done
-in a new task to avoid the possibilty of blocking @i{Amd}.
+in a new task to avoid the possibility of blocking @i{Amd}.
 
 @node     Network Host Filesystem, Network Filesystem Group, Network Filesystem, Filesystem Types
 @comment  node-name,  next,  previous,  up
@@ -3067,7 +3067,7 @@ By using the wildcard facility, @i{Amd} can @dfn{overlay} an existing
 directory with additional entries.
 The system files are usually mounted under @samp{/usr}.  If instead
 @i{Amd} is mounted on @samp{/usr}, additional
-names can be overlayed to augment or replace names in the ``master'' @samp{/usr}.
+names can be overlaid to augment or replace names in the ``master'' @samp{/usr}.
 A map to do this would have the form:
 
 @example
diff --git a/usr.sbin/amd/rpcx/amq.x b/usr.sbin/amd/rpcx/amq.x
index 716b35f7ae8..a4be66849d2 100644
--- a/usr.sbin/amd/rpcx/amq.x
+++ b/usr.sbin/amd/rpcx/amq.x
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq.x	8.1 (Berkeley) 6/6/93
- *	$Id: amq.x,v 1.6 2015/01/21 09:49:37 guenther Exp $
+ *	$Id: amq.x,v 1.7 2022/12/28 21:30:15 jmc Exp $
  *
  */
 
@@ -118,7 +118,7 @@ program AMQ_PROGRAM {
 	version AMQ_VERSION {
 		/*
 		 * Does no work. It is made available in all RPC services
-		 * to allow server reponse testing and timing
+		 * to allow server response testing and timing
 		 */
 		void
 		AMQPROC_NULL(void) = 0;
diff --git a/usr.sbin/amd/rpcx/nfs_prot.x b/usr.sbin/amd/rpcx/nfs_prot.x
index 230e372fa0f..55173bc6eaf 100644
--- a/usr.sbin/amd/rpcx/nfs_prot.x
+++ b/usr.sbin/amd/rpcx/nfs_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_prot.x,v 1.1 2015/01/22 03:43:58 guenther Exp $	*/
+/*	$OpenBSD: nfs_prot.x,v 1.2 2022/12/28 21:30:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -138,7 +138,7 @@ struct fattr {
 	unsigned uid;		/* owner user id */
 	unsigned gid;		/* owner group id */
 	unsigned size;		/* file size in bytes */
-	unsigned blocksize;	/* prefered block size */
+	unsigned blocksize;	/* preferred block size */
 	unsigned rdev;		/* special device # */
 	unsigned blocks;	/* Kb of disk used by file */
 	unsigned fsid;		/* device # */
diff --git a/usr.sbin/bgpctl/output_json.c b/usr.sbin/bgpctl/output_json.c
index 22752f11cea..008d2f3e462 100644
--- a/usr.sbin/bgpctl/output_json.c
+++ b/usr.sbin/bgpctl/output_json.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: output_json.c,v 1.26 2022/11/09 14:20:11 claudio Exp $ */
+/*	$OpenBSD: output_json.c,v 1.27 2022/12/28 21:30:15 jmc Exp $ */
 
 /*
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@@ -903,7 +903,7 @@ json_rib(struct ctl_show_rib *r, u_char *asdata, size_t aslen,
 	json_do_printf("last_update", "%s", fmt_timeframe(r->age));
 	json_do_int("last_update_sec", r->age);
 
-	/* keep the object open for communities and attribuites */
+	/* keep the object open for communities and attributes */
 }
 
 static void
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c
index 28c0e83a2f3..025be0f0aa5 100644
--- a/usr.sbin/bgpd/config.c
+++ b/usr.sbin/bgpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.105 2022/11/18 10:17:23 claudio Exp $ */
+/*	$OpenBSD: config.c,v 1.106 2022/12/28 21:30:15 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -352,7 +352,7 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf)
 		} else		/* exists, just flag */
 			ola->reconf = RECONF_KEEP;
 	}
-	/* finally clean up the original list and remove all stale entires */
+	/* finally clean up the original list and remove all stale entries */
 	for (nla = TAILQ_FIRST(xconf->listen_addrs); nla != NULL; nla = next) {
 		next = TAILQ_NEXT(nla, entry);
 		if (nla->reconf == RECONF_DELETE) {
diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index bf3877f2157..4d3bfc782b8 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.302 2022/11/09 14:26:14 claudio Exp $ */
+/*	$OpenBSD: kroute.c,v 1.303 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -2099,7 +2099,7 @@ kif_validate(struct kif *kif)
 }
 
 /*
- * return 1 when the interface is up and the link state is up or unknwown
+ * return 1 when the interface is up and the link state is up or unknown
  * except when this is a carp interface, then return 1 only when link state
  * is up
  */
@@ -2435,7 +2435,7 @@ mask2prefixlen6(struct sockaddr_in6 *sa_in6)
 	u_int	 l = 0;
 
 	/*
-	 * sin6_len is the size of the sockaddr so substract the offset of
+	 * sin6_len is the size of the sockaddr so subtract the offset of
 	 * the possibly truncated sin6_addr struct.
 	 */
 	ap = (uint8_t *)&sa_in6->sin6_addr;
diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c
index fe104727d72..d3b417e789a 100644
--- a/usr.sbin/bgpd/mrt.c
+++ b/usr.sbin/bgpd/mrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mrt.c,v 1.110 2022/09/01 13:23:24 claudio Exp $ */
+/*	$OpenBSD: mrt.c,v 1.111 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -109,7 +109,7 @@ mrt_update_msg_guess_aid(uint8_t *pkg, uint16_t pkglen)
 	pkglen -= 2;
 
 	if (wlen > 0) {
-		/* UPDATE has withdraw routes, therefor IPv4 */
+		/* UPDATE has withdraw routes, therefore IPv4 */
 		return AID_INET;
 	}
 
@@ -119,7 +119,7 @@ mrt_update_msg_guess_aid(uint8_t *pkg, uint16_t pkglen)
 	pkglen -= 2;
 
 	if (alen < pkglen) {
-		/* UPDATE has NLRI prefixes, therefor IPv4 */
+		/* UPDATE has NLRI prefixes, therefore IPv4 */
 		return AID_INET;
 	}
 
@@ -972,7 +972,7 @@ mrt_dump_hdr_se(struct ibuf ** bp, struct peer *peer, uint16_t type,
 	}
 
 	DUMP_LONG(*bp, len);
-	/* milisecond field use by the _ET format */
+	/* millisecond field use by the _ET format */
 	DUMP_LONG(*bp, time.tv_nsec / 1000);
 
 	if (subtype == BGP4MP_STATE_CHANGE_AS4 ||
diff --git a/usr.sbin/bgpd/mrt.h b/usr.sbin/bgpd/mrt.h
index d6ce17cbd54..db543c06da2 100644
--- a/usr.sbin/bgpd/mrt.h
+++ b/usr.sbin/bgpd/mrt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mrt.h,v 1.37 2022/02/06 09:51:19 claudio Exp $ */
+/*	$OpenBSD: mrt.h,v 1.38 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -73,7 +73,7 @@ enum MRT_MSG_TYPES {
 
 /*
  * Main zebra dump format is in MSG_PROTOCOL_BGP4MP exceptions are table dumps
- * that are normaly saved as MSG_TABLE_DUMP.
+ * that are normally saved as MSG_TABLE_DUMP.
  * In most cases this is the format to choose to dump updates et al.
  */
 enum MRT_BGP4MP_SUBTYPES {
@@ -162,7 +162,7 @@ enum MRT_BGP4MP_SUBTYPES {
  *   ...                      |
  * +--------+--------+--------+
  *
- * View is normaly 0 and originated the time of last change.
+ * View is normally 0 and originated the time of last change.
  * The status seems to be 1 by default but probably something to indicate
  * the status of a prefix would be more useful.
  * The format of the nexthop address is defined via the afi value. For IPv6
@@ -298,7 +298,7 @@ enum MRT_DUMP_V2_SUBTYPES {
  * +--------+--------+--------+
  *
  *
- * View is normaly 0 and seqnum just a simple counter for this dump.
+ * View is normally 0 and seqnum just a simple counter for this dump.
  * The status field is unused and should be set to 1.
  */
 
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 0b07ba58c59..61f1ca58573 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.581 2022/12/14 14:16:20 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.582 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -523,7 +523,7 @@ rde_dispatch_imsg_session(struct imsgbuf *ibuf)
 				network_add(&netconf_s, &netconf_state);
 				break;
 			case 0:
-				/* something failed beforehands */
+				/* something failed beforehand */
 				break;
 			default:
 badnet:
@@ -850,7 +850,7 @@ rde_dispatch_imsg_parent(struct imsgbuf *ibuf)
 				/* no change to rib apart from filters */
 				rib->state = RECONF_KEEP;
 			} else {
-				/* reload rib because somehing changed */
+				/* reload rib because something changed */
 				rib->flags_tmp = rr.flags;
 				rib->rtableid_tmp = rr.rtableid;
 				rib->state = RECONF_RELOAD;
@@ -1737,7 +1737,7 @@ rde_update_withdraw(struct rde_peer *peer, uint32_t path_id,
  * BGP UPDATE parser functions
  */
 
-/* attribute parser specific makros */
+/* attribute parser specific macros */
 #define UPD_READ(t, p, plen, n) \
 	do { \
 		memcpy(t, p, n); \
diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index 35017f58190..ac0457bc115 100644
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.h,v 1.274 2022/12/14 12:37:15 claudio Exp $ */
+/*	$OpenBSD: rde.h,v 1.275 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -202,8 +202,8 @@ struct rde_community {
 #define	F_PREFIX_ANNOUNCED	0x00400
 #define	F_ANN_DYNAMIC		0x00800
 #define	F_ATTR_OTC		0x01000	/* OTC present */
-#define	F_ATTR_OTC_LOOP		0x02000 /* otc loop, not eligable */
-#define	F_ATTR_PARSE_ERR	0x10000 /* parse error, not eligable */
+#define	F_ATTR_OTC_LOOP		0x02000 /* otc loop, not eligible */
+#define	F_ATTR_PARSE_ERR	0x10000 /* parse error, not eligible */
 #define	F_ATTR_LINKED		0x20000 /* if set path is on various lists */
 
 #define ORIGIN_IGP		0
diff --git a/usr.sbin/bgpd/rde_community.c b/usr.sbin/bgpd/rde_community.c
index 40f25ae38a2..8c470480ded 100644
--- a/usr.sbin/bgpd/rde_community.c
+++ b/usr.sbin/bgpd/rde_community.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_community.c,v 1.9 2022/09/01 13:19:11 claudio Exp $ */
+/*	$OpenBSD: rde_community.c,v 1.10 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org>
@@ -857,7 +857,7 @@ communities_copy(struct rde_community *to, struct rde_community *from)
 {
 	memset(to, 0, sizeof(*to));
 
-	/* ingore from->size and allocate the perfect amount */
+	/* ignore from->size and allocate the perfect amount */
 	to->size = from->size;
 	to->nentries = from->nentries;
 	to->flags = from->flags;
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c
index c4321b94cd9..4325451cd8a 100644
--- a/usr.sbin/bgpd/rde_rib.c
+++ b/usr.sbin/bgpd/rde_rib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_rib.c,v 1.250 2022/10/12 11:26:05 jsg Exp $ */
+/*	$OpenBSD: rde_rib.c,v 1.251 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -740,7 +740,7 @@ path_copy(struct rde_aspath *dst, const struct rde_aspath *src)
 	return (dst);
 }
 
-/* initialize or pepare an aspath for use */
+/* initialize or prepare an aspath for use */
 struct rde_aspath *
 path_prep(struct rde_aspath *asp)
 {
@@ -1130,7 +1130,7 @@ prefix_adjout_update(struct prefix *p, struct rde_peer *peer,
 
 	if (p == NULL) {
 		p = prefix_alloc();
-		/* initally mark DEAD so code below is skipped */
+		/* initially mark DEAD so code below is skipped */
 		p->flags |= PREFIX_FLAG_ADJOUT | PREFIX_FLAG_DEAD;
 
 		p->pt = pt_get(prefix, prefixlen);
diff --git a/usr.sbin/bgpd/rde_trie.c b/usr.sbin/bgpd/rde_trie.c
index 029a807dd60..cbd55c360e2 100644
--- a/usr.sbin/bgpd/rde_trie.c
+++ b/usr.sbin/bgpd/rde_trie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_trie.c,v 1.16 2022/08/31 11:25:36 claudio Exp $ */
+/*	$OpenBSD: rde_trie.c,v 1.17 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2018 Claudio Jeker <claudio@openbsd.org>
@@ -35,7 +35,7 @@
  * nodes. Internal nodes are added when needed because off path nodes are being
  * inserted and are just used for branching.
  * During lookup every node defines which bit is checked for branching. This
- * offset is strictly increasing. For IPv4 the maximum is therefor 32 levels.
+ * offset is strictly increasing. For IPv4 the maximum is therefore 32 levels.
  * Every node checks the bit at position plen to decide which branch to take.
  * The real nodes also include a prefixlen mask which represents the prefixlen
  * range that was defined. The prefixlen mask for IPv4 only has 32 bits but
@@ -592,7 +592,7 @@ trie_roa_check_v4(struct trie_head *th, struct in_addr *prefix, uint8_t plen,
 		if (n->node) {
 			/*
 			 * The prefix is covered by this roa node
-			 * therefor invalid unless roa_set matches.
+			 * therefore invalid unless roa_set matches.
 			 */
 			validity = ROA_INVALID;
 
@@ -640,7 +640,7 @@ trie_roa_check_v6(struct trie_head *th, struct in6_addr *prefix, uint8_t plen,
 		if (n->node) {
 			/*
 			 * This prefix is covered by this roa node.
-			 * Therefor invalid unless proven otherwise.
+			 * Therefore invalid unless proven otherwise.
 			 */
 			validity = ROA_INVALID;
 
diff --git a/usr.sbin/bgpd/rtr_proto.c b/usr.sbin/bgpd/rtr_proto.c
index ea59f65a479..97ff01c07b6 100644
--- a/usr.sbin/bgpd/rtr_proto.c
+++ b/usr.sbin/bgpd/rtr_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtr_proto.c,v 1.7 2022/07/11 16:47:27 claudio Exp $ */
+/*	$OpenBSD: rtr_proto.c,v 1.8 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@@ -360,7 +360,7 @@ rtr_parse_header(struct rtr_session *rs, void *buf,
 			return -1;
 		}
 		/*
-		 * session_id check ommitted since ROUTER_KEY and ERROR_REPORT
+		 * session_id check omitted since ROUTER_KEY and ERROR_REPORT
 		 * use the field for different things.
 		 */
 		return 0;
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 00535257692..88a0f84bb7a 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.437 2022/12/27 17:05:38 claudio Exp $ */
+/*	$OpenBSD: session.c,v 1.438 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -586,7 +586,7 @@ init_peer(struct peer *p)
 
 	/*
 	 * on startup, demote if requested.
-	 * do not handle new peers. they must reach ESTABLISHED beforehands.
+	 * do not handle new peers. they must reach ESTABLISHED beforehand.
 	 * peers added at runtime have reconf_action set to RECONF_REINIT.
 	 */
 	if (p->reconf_action != RECONF_REINIT && p->conf.demote_group[0])
@@ -1505,7 +1505,7 @@ session_open(struct peer *p)
 	if (optparamlen == 0) {
 		/* nothing */
 	} else if (optparamlen + 2 >= 255) {
-		/* RFC9072: 2 byte lenght instead of 1 + 3 byte extra header */
+		/* RFC9072: 2 byte length instead of 1 + 3 byte extra header */
 		optparamlen += sizeof(op_type) + 2 + 3;
 		msg.optparamlen = 255;
 		extlen = 1;
@@ -2775,7 +2775,7 @@ capa_neg_calc(struct peer *p, uint8_t *suberr)
 	/*
 	 * graceful restart: the peer capabilities are of interest here.
 	 * It is necessary to compare the new values with the previous ones
-	 * and act acordingly. AFI/SAFI that are not part in the MP capability
+	 * and act accordingly. AFI/SAFI that are not part in the MP capability
 	 * are treated as not being present.
 	 * Also make sure that a flush happens if the session stopped
 	 * supporting graceful restart.
diff --git a/usr.sbin/btrace/bt_parse.y b/usr.sbin/btrace/bt_parse.y
index 1beedf8c543..12bfdef9528 100644
--- a/usr.sbin/btrace/bt_parse.y
+++ b/usr.sbin/btrace/bt_parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_parse.y,v 1.48 2022/11/12 14:19:08 mpi Exp $	*/
+/*	$OpenBSD: bt_parse.y,v 1.49 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2019-2021 Martin Pieuchot <mpi@openbsd.org>
@@ -651,12 +651,12 @@ bh_inc(const char *hname, struct bt_arg *hval, struct bt_arg *hrange)
 				min = (long)ba->ba_value;
 				if (min >= 0)
 					break;
-				yyerror("negative minium");
+				yyerror("negative minimum");
 			case 2:
 				max = (long)ba->ba_value;
 				if (max > min)
 					break;
-				yyerror("maximum smaller than minium (%d < %d)",
+				yyerror("maximum smaller than minimum (%d < %d)",
 				    max,  min);
 			case 3:
 				break;
@@ -877,7 +877,7 @@ again:
 				case 't':	c = '\t';	break;
 				case 'v':	c = '\v';	break;
 				default:
-					yyerror("'%c' unsuported escape", c);
+					yyerror("'%c' unsupported escape", c);
 					return ERROR;
 				}
 			}
diff --git a/usr.sbin/btrace/bt_parser.h b/usr.sbin/btrace/bt_parser.h
index 4c6165df130..6fe2eb43235 100644
--- a/usr.sbin/btrace/bt_parser.h
+++ b/usr.sbin/btrace/bt_parser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_parser.h,v 1.22 2021/11/12 16:57:24 claudio Exp $	*/
+/*	$OpenBSD: bt_parser.h,v 1.23 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2019-2021 Martin Pieuchot <mpi@openbsd.org>
@@ -111,7 +111,7 @@ struct bt_var {
 };
 
 /*
- * Respresentation of an argument.
+ * Representation of an argument.
  *
  * A so called "argument" can be any symbol representing a value or
  * a combination of those through an operation.
diff --git a/usr.sbin/btrace/btrace.c b/usr.sbin/btrace/btrace.c
index 0db10681ed8..b5d43829134 100644
--- a/usr.sbin/btrace/btrace.c
+++ b/usr.sbin/btrace/btrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btrace.c,v 1.67 2022/11/12 14:19:08 mpi Exp $ */
+/*	$OpenBSD: btrace.c,v 1.68 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2019 - 2021 Martin Pieuchot <mpi@openbsd.org>
@@ -1428,7 +1428,7 @@ ba2long(struct bt_arg *ba, struct dt_evt *dtev)
 		break;
 	case B_AT_MAP:
 		bv = ba->ba_value;
-		/* Unitialized map */
+		/* Uninitialized map */
 		if (bv->bv_value == NULL)
 			return 0;
 		val = ba2long(map_get((struct map *)bv->bv_value,
@@ -1534,7 +1534,7 @@ ba2str(struct bt_arg *ba, struct dt_evt *dtev)
 		break;
 	case B_AT_MAP:
 		bv = ba->ba_value;
-		/* Unitialized map */
+		/* Uninitialized map */
 		if (bv->bv_value == NULL) {
 			str = buf;
 			break;
diff --git a/usr.sbin/cron/atrun.c b/usr.sbin/cron/atrun.c
index dff0ebf387e..c65a2235f3a 100644
--- a/usr.sbin/cron/atrun.c
+++ b/usr.sbin/cron/atrun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atrun.c,v 1.53 2021/10/24 21:24:18 deraadt Exp $	*/
+/*	$OpenBSD: atrun.c,v 1.54 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 Todd C. Miller <millert@openbsd.org>
@@ -187,7 +187,7 @@ atrun(at_db *db, double batch_maxload, time_t now)
 		if (fstatat(dfd, atfile, &sb, AT_SYMLINK_NOFOLLOW) != 0) {
 			TAILQ_REMOVE(&db->jobs, job, entries);
 			free(job);
-			continue;		/* disapeared from queue */
+			continue;		/* disappeared from queue */
 		}
 		if (!S_ISREG(sb.st_mode)) {
 			syslog(LOG_WARNING, "(CRON) NOT REGULAR (%s)",
diff --git a/usr.sbin/dvmrpd/rde.c b/usr.sbin/dvmrpd/rde.c
index 8f79137a939..22081a5c2b9 100644
--- a/usr.sbin/dvmrpd/rde.c
+++ b/usr.sbin/dvmrpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.31 2021/01/19 12:29:46 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.32 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -352,7 +352,7 @@ rde_select_ds_ifs(struct mfc *mfc, struct iface *iface)
 
 	rn = rt_match_origin(mfc->origin.s_addr);
 	if (rn == NULL) {
-		log_debug("rde_selected_ds_iface: no informations about "
+		log_debug("rde_selected_ds_iface: no information about "
 		    "the origin %s", inet_ntoa(mfc->origin));
 		return (0);
 	}
diff --git a/usr.sbin/eigrpd/hello.c b/usr.sbin/eigrpd/hello.c
index e3aefa2f488..cbc6c9e2b31 100644
--- a/usr.sbin/eigrpd/hello.c
+++ b/usr.sbin/eigrpd/hello.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hello.c,v 1.5 2016/09/02 16:29:55 renato Exp $ */
+/*	$OpenBSD: hello.c,v 1.6 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -110,7 +110,7 @@ recv_hello(struct eigrp_iface *ei, union eigrpd_addr *src, struct nbr *nbr,
 	    tp->kvalues[2] == 255 && tp->kvalues[3] == 255 &&
 	    tp->kvalues[4] == 255 && tp->kvalues[5] == 0) {
 		if (nbr) {
-			log_debug("%s: peer temination", __func__);
+			log_debug("%s: peer termination", __func__);
 			nbr_del(nbr);
 		}
 		return;
diff --git a/usr.sbin/eigrpd/kroute.c b/usr.sbin/eigrpd/kroute.c
index 35c73bf85c1..23eb6edbb8e 100644
--- a/usr.sbin/eigrpd/kroute.c
+++ b/usr.sbin/eigrpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.18 2017/07/24 11:00:01 friehm Exp $ */
+/*	$OpenBSD: kroute.c,v 1.19 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -698,7 +698,7 @@ kif_remove(struct kif_node *kif)
 	struct kif_addr	*ka;
 
 	if (RB_REMOVE(kif_tree, &kit, kif) == NULL) {
-		log_warnx("%s failed for inteface %s", __func__, kif->k.ifname);
+		log_warnx("%s failed for interface %s", __func__, kif->k.ifname);
 		return (-1);
 	}
 
diff --git a/usr.sbin/eigrpd/rde_dual.c b/usr.sbin/eigrpd/rde_dual.c
index 7fbc66c7102..4b965bc5349 100644
--- a/usr.sbin/eigrpd/rde_dual.c
+++ b/usr.sbin/eigrpd/rde_dual.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_dual.c,v 1.29 2022/01/20 14:11:27 naddy Exp $ */
+/*	$OpenBSD: rde_dual.c,v 1.30 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -633,7 +633,7 @@ rt_update_fib(struct rt_node *rn)
 
 			/*
 			 * Only feasible successors and the successor itself
-			 * are elegible to be installed.
+			 * are eligible to be installed.
 			 */
 			if (route->rdistance >= rn->successor.fdistance)
 				goto uninstall;
@@ -708,7 +708,7 @@ rt_get_successor_fc(struct rt_node *rn)
 	TAILQ_FOREACH(route, &rn->routes, entry)
 		if (route->type == EIGRP_ROUTE_INTERNAL) {
 			/*
-			 * connected routes should always be prefered over
+			 * connected routes should always be preferred over
 			 * received routes independent of the metric.
 			 */
 			if (route->nbr->flags & F_RDE_NBR_LOCAL)
@@ -720,7 +720,7 @@ rt_get_successor_fc(struct rt_node *rn)
 	TAILQ_FOREACH(route, &rn->routes, entry) {
 		/*
 		 * draft-savage-eigrp-04 - Section 5.4.7:
-		 * "Internal routes MUST be prefered over external routes
+		 * "Internal routes MUST be preferred over external routes
 		 * independent of the metric."
 		 */
 		if (route->type == EIGRP_ROUTE_EXTERNAL && !external_only)
diff --git a/usr.sbin/eigrpd/util.c b/usr.sbin/eigrpd/util.c
index bc7bff4f479..0b802d119d9 100644
--- a/usr.sbin/eigrpd/util.c
+++ b/usr.sbin/eigrpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.11 2022/05/06 15:51:09 claudio Exp $ */
+/*	$OpenBSD: util.c,v 1.12 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -42,7 +42,7 @@ mask2prefixlen6(struct sockaddr_in6 *sa_in6)
 	uint8_t *ap, *ep;
 
 	/*
-	 * sin6_len is the size of the sockaddr so substract the offset of
+	 * sin6_len is the size of the sockaddr so subtract the offset of
 	 * the possibly truncated sin6_addr struct.
 	 */
 	ap = (uint8_t *)&sa_in6->sin6_addr;
@@ -265,7 +265,7 @@ embedscope(struct sockaddr_in6 *sin6)
 	if (IN6_IS_SCOPE_EMBED(&sin6->sin6_addr)) {
 		memcpy(&tmp16, &sin6->sin6_addr.s6_addr[2], sizeof(tmp16));
 		if (tmp16 != 0) {
-			log_warnx("%s: address %s already has embeded scope %u",
+			log_warnx("%s: address %s already has embedded scope %u",
 			    __func__, log_sockaddr(sin6), ntohs(tmp16));
 		}
 		tmp16 = htons(sin6->sin6_scope_id);
diff --git a/usr.sbin/hostapd/parse.y b/usr.sbin/hostapd/parse.y
index 564f39190ef..c368f3a629b 100644
--- a/usr.sbin/hostapd/parse.y
+++ b/usr.sbin/hostapd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.62 2021/10/15 15:01:28 naddy Exp $	*/
+/*	$OpenBSD: parse.y,v 1.63 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -1101,7 +1101,7 @@ assign		: ARROW
 mask		: '&'
 		;
 
-comma		: /* emtpy */
+comma		: /* empty */
 		| ',' optnl
 		;
 
diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index fe5c2ab9110..624f7eb0566 100644
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.62 2021/10/24 16:01:04 ian Exp $	*/
+/*	$OpenBSD: config.c,v 1.63 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -233,7 +233,7 @@ config_setserver(struct httpd *env, struct server *srv)
 				return (-1);
 			}
 
-			/* Configure FCGI parmeters if necessary. */
+			/* Configure FCGI parameters if necessary. */
 			config_setserver_fcgiparams(env, srv);
 		}
 	}
diff --git a/usr.sbin/ifstated/ifstated.c b/usr.sbin/ifstated/ifstated.c
index 621beb0de4a..80e5c48eac6 100644
--- a/usr.sbin/ifstated/ifstated.c
+++ b/usr.sbin/ifstated/ifstated.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifstated.c,v 1.66 2021/07/12 15:09:21 beck Exp $	*/
+/*	$OpenBSD: ifstated.c,v 1.67 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2004 Marco Pfatschbacher <mpf@openbsd.org>
@@ -515,7 +515,7 @@ scan_ifstate(const char *ifname, int s, int do_eval)
 }
 
 /*
- * Do a bottom-up ajustment of the expression tree's truth value,
+ * Do a bottom-up adjustment of the expression tree's truth value,
  * level-by-level to ensure that each expression's subexpressions have been
  * evaluated.
  */
diff --git a/usr.sbin/installboot/i386_nlist.c b/usr.sbin/installboot/i386_nlist.c
index b122a3e6638..f7a7bde270a 100644
--- a/usr.sbin/installboot/i386_nlist.c
+++ b/usr.sbin/installboot/i386_nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_nlist.c,v 1.8 2021/10/24 21:24:18 deraadt Exp $	*/
+/*	$OpenBSD: i386_nlist.c,v 1.9 2022/12/28 21:30:16 jmc Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -64,7 +64,7 @@ __elf_is_okay__(Elf_Ehdr *ehdr)
 {
 	int retval = 0;
 	/*
-	 * We need to check magic, class size, endianess,
+	 * We need to check magic, class size, endianness,
 	 * and version before we look at the rest of the
 	 * Elf_Ehdr structure.  These few elements are
 	 * represented in a machine independent fashion.
diff --git a/usr.sbin/installboot/landisk_installboot.c b/usr.sbin/installboot/landisk_installboot.c
index 0be563c8edc..5a0ff3cb7cd 100644
--- a/usr.sbin/installboot/landisk_installboot.c
+++ b/usr.sbin/installboot/landisk_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: landisk_installboot.c,v 1.11 2022/08/31 18:46:06 miod Exp $	*/
+/*	$OpenBSD: landisk_installboot.c,v 1.12 2022/12/28 21:30:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
@@ -71,7 +71,7 @@ md_installboot(int devfd, char *dev)
 			exit(1);
 
 	/*
-	 * Write bootblock into the beggining of the OpenBSD partition or
+	 * Write bootblock into the beginning of the OpenBSD partition or
 	 * at the beginning of the disk.
 	 */
 	md_bootstrap(devfd, dev, stage1);
diff --git a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h
index 3ace3eee169..7fb1dfbdeb8 100644
--- a/usr.sbin/iscsid/iscsid.h
+++ b/usr.sbin/iscsid/iscsid.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iscsid.h,v 1.17 2021/04/16 14:37:06 claudio Exp $ */
+/*	$OpenBSD: iscsid.h,v 1.18 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org>
@@ -276,7 +276,7 @@ struct connection {
 	u_int32_t		 expstatsn;
 	int			 state;
 	int			 fd;
-	u_int16_t		 cid;	/* conection id */
+	u_int16_t		 cid;	/* connection id */
 };
 
 struct task {
diff --git a/usr.sbin/iscsid/vscsi.c b/usr.sbin/iscsid/vscsi.c
index dc8d5ed67e0..c19b50c714d 100644
--- a/usr.sbin/iscsid/vscsi.c
+++ b/usr.sbin/iscsid/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.17 2016/08/16 18:41:57 tedu Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.18 2022/12/28 21:30:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org>
@@ -100,7 +100,7 @@ vscsi_dispatch(int fd, short event, void *arg)
 		fatal("vscsi_dispatch");
 
 	sreq->opcode = ISCSI_OP_SCSI_REQUEST;
-	/* XXX use untagged commands, dlg sais so */
+	/* XXX use untagged commands, dlg says so */
 	sreq->flags = ISCSI_SCSI_F_F | ISCSI_SCSI_ATTR_UNTAGGED;
 	if (i2t.direction == VSCSI_DIR_WRITE)
 		sreq->flags |= ISCSI_SCSI_F_W;
diff --git a/usr.sbin/ldpd/lde_lib.c b/usr.sbin/ldpd/lde_lib.c
index 5b58205eee9..d92b836f8fe 100644
--- a/usr.sbin/ldpd/lde_lib.c
+++ b/usr.sbin/ldpd/lde_lib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde_lib.c,v 1.69 2017/03/04 00:15:35 renato Exp $ */
+/*	$OpenBSD: lde_lib.c,v 1.70 2022/12/28 21:30:17 jmc Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -883,7 +883,7 @@ lde_wildcard_apply(struct map *wcard, struct fec *fec, struct lde_map *me)
 	}
 }
 
-/* gabage collector timer: timer to remove dead entries from the LIB */
+/* garbage collector timer: timer to remove dead entries from the LIB */
 
 /* ARGSUSED */
 void
diff --git a/usr.sbin/ldpd/util.c b/usr.sbin/ldpd/util.c
index 25c1cbed9d7..c3968df80bb 100644
--- a/usr.sbin/ldpd/util.c
+++ b/usr.sbin/ldpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.6 2022/05/06 15:51:09 claudio Exp $ */
+/*	$OpenBSD: util.c,v 1.7 2022/12/28 21:30:17 jmc Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -41,7 +41,7 @@ mask2prefixlen6(struct sockaddr_in6 *sa_in6)
 	uint8_t *ap, *ep;
 
 	/*
-	 * sin6_len is the size of the sockaddr so substract the offset of
+	 * sin6_len is the size of the sockaddr so subtract the offset of
 	 * the possibly truncated sin6_addr struct.
 	 */
 	ap = (uint8_t *)&sa_in6->sin6_addr;
@@ -264,7 +264,7 @@ embedscope(struct sockaddr_in6 *sin6)
 	if (IN6_IS_SCOPE_EMBED(&sin6->sin6_addr)) {
 		memcpy(&tmp16, &sin6->sin6_addr.s6_addr[2], sizeof(tmp16));
 		if (tmp16 != 0) {
-			log_warnx("%s: address %s already has embeded scope %u",
+			log_warnx("%s: address %s already has embedded scope %u",
 			    __func__, log_sockaddr(sin6), ntohs(tmp16));
 		}
 		tmp16 = htons(sin6->sin6_scope_id);
diff --git a/usr.sbin/lpd/control.c b/usr.sbin/lpd/control.c
index a19d96277b2..1904327a000 100644
--- a/usr.sbin/lpd/control.c
+++ b/usr.sbin/lpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.1 2018/04/27 16:14:35 eric Exp $	*/
+/*	$OpenBSD: control.c,v 1.2 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -67,7 +67,7 @@ control(int debug, int verbose)
 
 	control_init(LPD_SOCKET);
 
-	/* Drop priviledges. */
+	/* Drop privileges. */
 	if ((pw = getpwnam(LPD_USER)) == NULL)
 		fatalx("unknown user " LPD_USER);
 
diff --git a/usr.sbin/lpd/engine.c b/usr.sbin/lpd/engine.c
index bab89733a3e..f3ef987afe5 100644
--- a/usr.sbin/lpd/engine.c
+++ b/usr.sbin/lpd/engine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: engine.c,v 1.2 2018/09/05 17:32:56 eric Exp $	*/
+/*	$OpenBSD: engine.c,v 1.3 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -49,7 +49,7 @@ engine(int debug, int verbose)
 		fatal("%s: malloc", __func__);
 	gethostname(lpd_hostname, HOST_NAME_MAX + 1);
 
-	/* Drop priviledges. */
+	/* Drop privileges. */
 	if ((pw = getpwnam(LPD_USER)) == NULL)
 		fatal("%s: getpwnam: %s", __func__, LPD_USER);
 
diff --git a/usr.sbin/lpd/frontend.c b/usr.sbin/lpd/frontend.c
index bb285b14df4..4521ef7ec34 100644
--- a/usr.sbin/lpd/frontend.c
+++ b/usr.sbin/lpd/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.2 2018/09/05 17:32:56 eric Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.3 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -79,7 +79,7 @@ frontend(int debug, int verbose)
 	SPLAY_INIT(&conns);
 	lpr_init();
 
-	/* Drop priviledges. */
+	/* Drop privileges. */
 	if ((pw = getpwnam(LPD_USER)) == NULL)
 		fatal("%s: getpwnam: %s", __func__, LPD_USER);
 
diff --git a/usr.sbin/lpd/frontend_lpr.c b/usr.sbin/lpd/frontend_lpr.c
index edcfe1b0a99..23b4d687843 100644
--- a/usr.sbin/lpd/frontend_lpr.c
+++ b/usr.sbin/lpd/frontend_lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend_lpr.c,v 1.3 2020/03/16 20:46:44 benno Exp $	*/
+/*	$OpenBSD: frontend_lpr.c,v 1.4 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -269,7 +269,7 @@ lpr_on_request(struct lpr_conn *conn, int fd, const char *hostname,
 			hints.ai_socktype = SOCK_STREAM;
 			conn->flags |= F_WAITADDRINFO;
 			/*
-			 * The callback might run immediatly, so conn->ifd
+			 * The callback might run immediately, so conn->ifd
 			 * must be set before, to block lpr_forward().
 			 */
 			resolver_getaddrinfo(hostname, "printer", &hints,
@@ -661,7 +661,7 @@ lpr_reply(struct lpr_conn *conn, const char *s)
 }
 
 /*
- * Stream reponse file to the client.
+ * Stream response file to the client.
  */
 static void
 lpr_stream(struct lpr_conn *conn)
diff --git a/usr.sbin/lpd/io.h b/usr.sbin/lpd/io.h
index 67adf09eb4e..3a3fa84b444 100644
--- a/usr.sbin/lpd/io.h
+++ b/usr.sbin/lpd/io.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.h,v 1.1 2018/04/27 16:14:36 eric Exp $	*/
+/*	$OpenBSD: io.h,v 1.2 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -50,7 +50,7 @@ int	io_set_bufsize(struct io *, size_t);
 void	io_set_timeout(struct io *, int);
 void	io_set_lowat(struct io *, size_t);
 
-/* State retreival */
+/* State retrieval */
 const char *io_error(struct io *);
 int	io_fileno(struct io *);
 
diff --git a/usr.sbin/lpd/lp.c b/usr.sbin/lpd/lp.c
index cb2ba8d6326..bc60e91f830 100644
--- a/usr.sbin/lpd/lp.c
+++ b/usr.sbin/lpd/lp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lp.c,v 1.3 2020/03/16 20:46:44 benno Exp $	*/
+/*	$OpenBSD: lp.c,v 1.4 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -822,7 +822,7 @@ lp_create(struct lp_printer *lp, int cf, size_t sz, const char *fname)
 
 	if (cf) {
 		/*
-		 * Create a temporay file, but we want to avoid
+		 * Create a temporary file, but we want to avoid
 		 * a collision with the final cf filename.
 		 */
 		/* XXX this would require a lock on .seq */
@@ -844,7 +844,7 @@ lp_create(struct lp_printer *lp, int cf, size_t sz, const char *fname)
 
 /*
  * Commit the job given by its temporary CF name.
- * This is done by renaming the temporay CF file name to its final name.
+ * This is done by renaming the temporary CF file name to its final name.
  * The functions return 0 on success, or -1 on error and set errno.
  */
 int
diff --git a/usr.sbin/lpd/lpd.c b/usr.sbin/lpd/lpd.c
index 01b5760cdc6..292902cf7c3 100644
--- a/usr.sbin/lpd/lpd.c
+++ b/usr.sbin/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpd.c,v 1.2 2019/06/28 13:32:48 deraadt Exp $	*/
+/*	$OpenBSD: lpd.c,v 1.3 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -168,7 +168,7 @@ main(int argc, char **argv)
 	signal_add(&evt_sighup, NULL);
 	signal(SIGPIPE, SIG_IGN);
 
-	/* Fork and exec unpriviledged processes. */
+	/* Fork and exec unprivileged processes. */
 	argv = calloc(saved_argc + 3, sizeof(*argv));
 	if (argv == NULL)
 		fatal("calloc");
diff --git a/usr.sbin/lpd/printer.c b/usr.sbin/lpd/printer.c
index 160b7f1e53e..ca9d5c0c3b0 100644
--- a/usr.sbin/lpd/printer.c
+++ b/usr.sbin/lpd/printer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printer.c,v 1.3 2021/10/24 21:24:18 deraadt Exp $	*/
+/*	$OpenBSD: printer.c,v 1.4 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2017 Eric Faurot <eric@openbsd.org>
@@ -141,7 +141,7 @@ printer(int debug, int verbose, const char *name)
 
 	/*
 	 * Redirect stderr if not in debug mode.
-	 * This must be done before dropping priviledges.
+	 * This must be done before dropping privileges.
 	 */
 	if (!debug) {
 		fd = open(LP_LF(lp), O_WRONLY|O_APPEND);
@@ -154,7 +154,7 @@ printer(int debug, int verbose, const char *name)
 		}
 	}
 
-	/* Drop priviledges. */
+	/* Drop privileges. */
 	if ((pw = getpwnam(LPD_USER)) == NULL)
 		fatalx("unknown user " LPD_USER);
 
@@ -1112,7 +1112,7 @@ prn_open(void)
 
 /*
  * Open the printer device, or connect to the remote host.
- * Return the printer file desciptor, or -1 on error.
+ * Return the printer file descriptor, or -1 on error.
  */
 static int
 prn_connect(void)
diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index 5255e336ba3..367c210aeda 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lp.local.h,v 1.4 2003/06/02 23:36:53 millert Exp $	*/
+/*	$OpenBSD: lp.local.h,v 1.5 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -67,7 +67,7 @@
 #define DROP	3		/* offset to drop characters with descenders */
 
 /*
- * Define TERMCAP if the terminal capabilites are to be used for lpq.
+ * Define TERMCAP if the terminal capabilities are to be used for lpq.
  */
 #define TERMCAP
 
diff --git a/usr.sbin/lpr/lpd/allowedhost.c b/usr.sbin/lpr/lpd/allowedhost.c
index cfb746d8eda..2e908b09ce4 100644
--- a/usr.sbin/lpr/lpd/allowedhost.c
+++ b/usr.sbin/lpr/lpd/allowedhost.c
@@ -215,7 +215,7 @@ gethostloop(struct sockaddr *raddr, socklen_t salen)
 	}
 
 	/*
-	 * Either the DNS adminstrator has made a configuration
+	 * Either the DNS administrator has made a configuration
 	 * mistake, or someone has attempted to spoof us.
 	 */
 	syslog(LOG_NOTICE, "lpd: address %s not listed for host %s",
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index e0d9196cfbb..5194a0494c3 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpd.c,v 1.65 2018/04/26 12:42:51 guenther Exp $	*/
+/*	$OpenBSD: lpd.c,v 1.66 2022/12/28 21:30:17 jmc Exp $	*/
 /*	$NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $	*/
 
 /*
@@ -189,7 +189,7 @@ main(int argc, char **argv)
 		case 'w':
 			l = strtol(optarg, &cp, 10);
 			if (*cp != '\0' || l < 0 || l >= INT_MAX)
-				errx(1, "wait time must be postive integer: %s",
+				errx(1, "wait time must be positive integer: %s",
 				    optarg);
 			wait_time = (u_int)l;
 			if (wait_time < 30)
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index c4c228b85cb..12fe0bf3c06 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpq.c,v 1.24 2022/12/04 23:50:51 cheloha Exp $	*/
+/*	$OpenBSD: lpq.c,v 1.25 2022/12/28 21:30:17 jmc Exp $	*/
 /*	$NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $	*/
 
 /*
@@ -98,7 +98,7 @@ main(int argc, char **argv)
 		case 'w':
 			l = strtol(optarg, &cp, 10);
 			if (*cp != '\0' || l < 0 || l >= INT_MAX)
-				errx(1, "wait time must be postive integer: %s",
+				errx(1, "wait time must be positive integer: %s",
 				    optarg);
 			wait_time = (u_int)l;
 			if (wait_time < 30)
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 9f95109b38f..cc92e3bb82b 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpr.c,v 1.49 2018/04/26 12:42:51 guenther Exp $ */
+/*	$OpenBSD: lpr.c,v 1.50 2022/12/28 21:30:17 jmc Exp $ */
 /*	$NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $	*/
 
 /*
@@ -168,7 +168,7 @@ main(int argc, char **argv)
 			jobname = optarg;
 			break;
 
-		case 'P':		/* specifiy printer name */
+		case 'P':		/* specify printer name */
 			printer = optarg;
 			break;
 
diff --git a/usr.sbin/makefs/msdos/msdosfs_unicode.c b/usr.sbin/makefs/msdos/msdosfs_unicode.c
index bb30ac57e3a..3a71eb2bd3a 100644
--- a/usr.sbin/makefs/msdos/msdosfs_unicode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_unicode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_unicode.c,v 1.2 2016/12/17 16:43:30 krw Exp $	*/
+/*	$OpenBSD: msdosfs_unicode.c,v 1.3 2022/12/28 21:30:17 jmc Exp $	*/
 /*	$NetBSD: msdosfs_unicode.c,v 1.2 2016/02/06 14:11:58 joerg Exp $	*/
 
 /*
@@ -307,7 +307,7 @@ msdosfs_unicode_foldmap[] = {
 	0x0398, 0x03B8, /* GREEK CAPITAL LETTER THETA */
 	0x0399, 0x03B9, /* GREEK CAPITAL LETTER IOTA */
 	0x039A, 0x03BA, /* GREEK CAPITAL LETTER KAPPA */
-	0x039B, 0x03BB, /* GREEK CAPITAL LETTER LAMDA */
+	0x039B, 0x03BB, /* GREEK CAPITAL LETTER LAMBDA */
 	0x039C, 0x03BC, /* GREEK CAPITAL LETTER MU */
 	0x039D, 0x03BD, /* GREEK CAPITAL LETTER NU */
 	0x039E, 0x03BE, /* GREEK CAPITAL LETTER XI */
diff --git a/usr.sbin/mopd/common/common.h b/usr.sbin/mopd/common/common.h
index 4f2cf122c43..aa902fba277 100644
--- a/usr.sbin/mopd/common/common.h
+++ b/usr.sbin/mopd/common/common.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.h,v 1.9 2014/12/13 14:44:59 miod Exp $	*/
+/*	$OpenBSD: common.h,v 1.10 2022/12/28 21:30:17 jmc Exp $	*/
 /*	$NetBSD: common.h,v 1.9 2011/08/30 19:49:10 joerg Exp $	*/
 
 /*
@@ -75,7 +75,7 @@ typedef enum {
 struct dllist {
 	u_char		status;		/* Status byte			*/
 	struct if_info *ii;		/* interface pointer		*/
-	u_char		eaddr[6];	/* targets ethernet addres	*/
+	u_char		eaddr[6];	/* targets ethernet address	*/
 	int		ldfd;		/* filedescriptor for loadfile	*/
 	u_short		dl_bsz;		/* Data Link Buffer Size	*/
 	int		timeout;	/* Timeout counter		*/
diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c
index 1324c84f0ec..524dd6e21c3 100644
--- a/usr.sbin/mopd/common/print.c
+++ b/usr.sbin/mopd/common/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.13 2017/07/29 07:18:03 florian Exp $ */
+/*	$OpenBSD: print.c,v 1.14 2022/12/28 21:30:17 jmc Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -453,7 +453,7 @@ mopPrintInfo(FILE *fd, u_char *pkt, int *idx, u_short moplen, u_char mopcode,
 			break;
 		case MOP_K_INFO_MFCT:
 			tmps = mopGetShort(pkt, idx);
-			fprintf(fd, "Maint Funcion: %04x ( ", tmps);
+			fprintf(fd, "Maint Function: %04x ( ", tmps);
 			if (tmps &   1) fprintf(fd, "Loop ");
 			if (tmps &   2) fprintf(fd, "Dump ");
 			if (tmps &   4) fprintf(fd, "Pldr ");
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index 487dfca03b5..3ecb923fe33 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopa.out.c,v 1.17 2017/10/29 08:45:53 mpi Exp $ */
+/*	$OpenBSD: mopa.out.c,v 1.18 2022/12/28 21:30:17 jmc Exp $ */
 
 /*
  * mopa.out - Convert a Unix format kernel into something that
@@ -6,7 +6,7 @@
  *
  * 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.
diff --git a/usr.sbin/mopd/otherOS/Makefile b/usr.sbin/mopd/otherOS/Makefile
index 72781085a23..00aed7c6752 100644
--- a/usr.sbin/mopd/otherOS/Makefile
+++ b/usr.sbin/mopd/otherOS/Makefile
@@ -1,10 +1,10 @@
 #  Copyright (c) 1993-1994 Mats O Jansson, Stockholm, Sweden
 #  All rights reserved.
 #
-# @(#) $OpenBSD: Makefile,v 1.5 2006/04/29 16:26:56 maja Exp $
+# @(#) $OpenBSD: Makefile,v 1.6 2022/12/28 21:30:17 jmc Exp $
 
 # Script (or program) that returns the machine and os types,
-# or jsut edit in the name yourself.
+# or just edit in the name yourself.
 MD=`./mdtype`
 OS=`./ostype`
 REL=`cat ../common/VERSION`
@@ -47,7 +47,7 @@ LEX = lex
 YACC = yacc -y
 MAKE = make
 
-# Explicitly define compiliation rule since SunOS 4's make doesn't like gcc.
+# Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
 # Also, gcc does not remove the .o before forking 'as', which can be a
 # problem if you don't own the file but can write to the directory.
 .c.o:
diff --git a/usr.sbin/mopd/otherOS/linux2/mopd-x.x.x.spec b/usr.sbin/mopd/otherOS/linux2/mopd-x.x.x.spec
index c5fdc87d6ab..45f330f9eda 100644
--- a/usr.sbin/mopd/otherOS/linux2/mopd-x.x.x.spec
+++ b/usr.sbin/mopd/otherOS/linux2/mopd-x.x.x.spec
@@ -1,4 +1,4 @@
-# $OpenBSD: mopd-x.x.x.spec,v 1.1 1999/03/27 14:31:23 maja Exp $
+# $OpenBSD: mopd-x.x.x.spec,v 1.2 2022/12/28 21:30:17 jmc Exp $
 Summary: MOP (Maintenance Operations Protocol) loader daemon
 Name: mopd
 Version: 2.5.4
@@ -16,7 +16,7 @@ filename can be given. This is the normal case for e.g. terminal servers.
 If a filename isn't given mopd must know what image to load.
 
 Upon receiving a request, mopd checks if the requested file exists in
-/tftpboot/mop, the filename is normaly uppercase and with an extension of
+/tftpboot/mop, the filename is normally uppercase and with an extension of
 .SYS. If the filename isn't given, the ethernet address of the target is
 used as filename, e.g.  08002b09f4de.SYS and it might be a soft link to
 another file.
diff --git a/usr.sbin/mrouted/rsrr.h b/usr.sbin/mrouted/rsrr.h
index 0a304b11389..61b6c750a93 100644
--- a/usr.sbin/mrouted/rsrr.h
+++ b/usr.sbin/mrouted/rsrr.h
@@ -68,7 +68,7 @@
  * Right-most bit is the Route Change Notification bit, set if the
  * reservation protocol wishes to receive notification of
  * a route change for the source-destination pair listed in the query.
- * Notification is in the form of an unsolicitied Route Reply.
+ * Notification is in the form of an unsolicited Route Reply.
  */
 #define RSRR_NOTIFICATION_BIT 0
 /* Next bit indicates an error returning the Route Reply. */
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index c228a88c494..82c2f1b481b 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -1111,7 +1111,7 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
 		n->al_genid = genid;
 	    else if (n->al_genid != genid) {
 		logit(LOG_DEBUG, 0,
-		    "new genid neigbor %s on vif %d [old:%x, new:%x]",
+		    "new genid neighbor %s on vif %d [old:%x, new:%x]",
 		    inet_fmt(addr, s1), vifi, n->al_genid, genid);
 
 		n->al_genid = genid;
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index bed0281ae66..37aa26a4352 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndp.c,v 1.106 2022/12/02 15:35:35 kn Exp $	*/
+/*	$OpenBSD: ndp.c,v 1.107 2022/12/28 21:30:17 jmc Exp $	*/
 /*	$KAME: ndp.c,v 1.101 2002/07/17 08:46:33 itojun Exp $	*/
 
 /*
@@ -598,7 +598,7 @@ again:;
 		printf("%-*.*s %-*.*s %*.*s", addrwidth, addrwidth, host_buf,
 		    llwidth, llwidth, ether_str(sdl), ifwidth, ifwidth, ifname);
 
-		/* Print neighbor discovery specific informations */
+		/* Print neighbor discovery specific information */
 		nbi = getnbrinfo(&sin->sin6_addr, sdl->sdl_index, 1);
 		if (nbi) {
 			if (nbi->expire > now.tv_sec) {
diff --git a/usr.sbin/npppd/l2tp/l2tp_ctrl.c b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
index a8a642b2d11..0e8152f3289 100644
--- a/usr.sbin/npppd/l2tp/l2tp_ctrl.c
+++ b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2tp_ctrl.c,v 1.26 2021/05/22 08:29:57 yasuoka Exp $	*/
+/*	$OpenBSD: l2tp_ctrl.c,v 1.27 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /**@file Control connection processing functions for L2TP LNS */
-/* $Id: l2tp_ctrl.c,v 1.26 2021/05/22 08:29:57 yasuoka Exp $ */
+/* $Id: l2tp_ctrl.c,v 1.27 2022/12/28 21:30:17 jmc Exp $ */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
@@ -1564,7 +1564,7 @@ l2tp_ctrl_send_ZLB(l2tp_ctrl *_this)
 }
 
 /*
- * Utitlity
+ * Utility
  */
 
 /**
diff --git a/usr.sbin/npppd/npppd/ppp.h b/usr.sbin/npppd/npppd/ppp.h
index dfab8c05217..ebabe30fa1c 100644
--- a/usr.sbin/npppd/npppd/ppp.h
+++ b/usr.sbin/npppd/npppd/ppp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp.h,v 1.23 2021/03/29 03:54:39 yasuoka Exp $ */
+/*	$OpenBSD: ppp.h,v 1.24 2022/12/28 21:30:17 jmc Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -454,7 +454,7 @@ struct _npppd_ppp {
 
 	/** Physical layer */
 	int		tunnel_type;		/** PPP Tunnel Type */
-	uint16_t	tunnel_session_id;	/** Tunnel Sesion Id */
+	uint16_t	tunnel_session_id;	/** Tunnel Session Id */
 	uint16_t	mru;			/** MRU */
 	uint16_t	peer_mru;		/** Peer's MRU */
 	void		*phy_context;		/** Context of physical layer */
diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c
index 0565d204a28..e2901c51b92 100644
--- a/usr.sbin/npppd/pptp/pptpd.c
+++ b/usr.sbin/npppd/pptp/pptpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptpd.c,v 1.33 2021/03/29 03:54:40 yasuoka Exp $	*/
+/*	$OpenBSD: pptpd.c,v 1.34 2022/12/28 21:30:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,12 +25,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: pptpd.c,v 1.33 2021/03/29 03:54:40 yasuoka Exp $ */
+/* $Id: pptpd.c,v 1.34 2022/12/28 21:30:17 jmc Exp $ */
 
 /**@file
  * This file provides a implementation of PPTP daemon.  Currently it
  * provides functions for PAC (PPTP Access Concentrator) only.
- * $Id: pptpd.c,v 1.33 2021/03/29 03:54:40 yasuoka Exp $
+ * $Id: pptpd.c,v 1.34 2022/12/28 21:30:17 jmc Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -661,7 +661,7 @@ pptpd_gre_io_event(int fd, short evmask, void *ctx)
 
 	if (evmask & EV_READ) {
 		for (;;) {
-			/* read till bloked */
+			/* read till blocked */
 			peerlen = sizeof(peer);
 			if ((sz = recvfrom(listener->sock_gre, pkt, sizeof(pkt),
 			    0, (struct sockaddr *)&peer, &peerlen)) == -1) {
diff --git a/usr.sbin/ocspcheck/ocspcheck.c b/usr.sbin/ocspcheck/ocspcheck.c
index 46e7e666073..516642b53f4 100644
--- a/usr.sbin/ocspcheck/ocspcheck.c
+++ b/usr.sbin/ocspcheck/ocspcheck.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocspcheck.c,v 1.30 2021/07/12 15:09:21 beck Exp $ */
+/* $OpenBSD: ocspcheck.c,v 1.31 2022/12/28 21:30:17 jmc Exp $ */
 
 /*
  * Copyright (c) 2017,2020 Bob Beck <beck@openbsd.org>
@@ -379,7 +379,7 @@ ocsp_request_new_from_cert(const char *cadir, char *file, int nonce)
 		goto err;
 	}
 	if (request->data == NULL) {
-		warnx("Unable to allocte memory");
+		warnx("Unable to allocate memory");
 		goto err;
 	}
 	return request;
diff --git a/usr.sbin/ospf6d/util.c b/usr.sbin/ospf6d/util.c
index c705e24b63a..6fe7695f792 100644
--- a/usr.sbin/ospf6d/util.c
+++ b/usr.sbin/ospf6d/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.3 2018/12/09 14:56:24 remi Exp $ */
+/*	$OpenBSD: util.c,v 1.4 2022/12/28 21:30:18 jmc Exp $ */
 
 /*
  * Copyright (c) 2012 Alexander Bluhm <bluhm@openbsd.org>
@@ -37,7 +37,7 @@ embedscope(struct sockaddr_in6 *sin6)
 	if (IN6_IS_SCOPE_EMBED(&sin6->sin6_addr)) {
 		bcopy(&sin6->sin6_addr.s6_addr[2], &tmp16, sizeof(tmp16));
 		if (tmp16 != 0) {
-			log_warnx("embedscope: address %s already has embeded "
+			log_warnx("embedscope: address %s already has embedded "
 			    "scope %u", log_sockaddr(sin6), ntohs(tmp16));
 		}
 		tmp16 = htons(sin6->sin6_scope_id);
@@ -95,7 +95,7 @@ mask2prefixlen(struct sockaddr_in6 *sa_in6)
 	u_int		 l = 0;
 
 	/*
-	 * sin6_len is the size of the sockaddr so substract the offset of
+	 * sin6_len is the size of the sockaddr so subtract the offset of
 	 * the possibly truncated sin6_addr struct.
 	 */
 	ap = (u_int8_t *)&sa_in6->sin6_addr;
diff --git a/usr.sbin/ospfd/hello.c b/usr.sbin/ospfd/hello.c
index 7267a56529b..5b66a92fd21 100644
--- a/usr.sbin/ospfd/hello.c
+++ b/usr.sbin/ospfd/hello.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hello.c,v 1.25 2019/11/19 09:55:55 remi Exp $ */
+/*	$OpenBSD: hello.c,v 1.26 2022/12/28 21:30:18 jmc Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -166,7 +166,7 @@ recv_hello(struct iface *iface, struct in_addr src, u_int32_t rtr_id, char *buf,
 	 * Only the router-id is compared since the source IP on NBMA,
 	 * broadcast and point-to-multipoint interfaces was already
 	 * compared in find_iface() and only IPs in the same subnet
-	 * are accepted. This is not excatly what the RFC specifies
+	 * are accepted. This is not exactly what the RFC specifies
 	 * but works far better.
 	 */
 	LIST_FOREACH(nbr, &iface->nbr_list, entry) {
diff --git a/usr.sbin/pkg_add/OpenBSD/BaseState.pod b/usr.sbin/pkg_add/OpenBSD/BaseState.pod
index 0daf4576cc8..eaa49a93bc9 100644
--- a/usr.sbin/pkg_add/OpenBSD/BaseState.pod
+++ b/usr.sbin/pkg_add/OpenBSD/BaseState.pod
@@ -1,8 +1,8 @@
-$OpenBSD: BaseState.pod,v 1.1 2022/01/21 17:41:41 espie Exp $
+$OpenBSD: BaseState.pod,v 1.2 2022/12/28 21:30:18 jmc Exp $
 
 =head1 NAME
 
-OpenBSD::BaseState - light-weight IO and system acces in pkg_add
+OpenBSD::BaseState - light-weight IO and system access in pkg_add
 
 =head1 SYNOPSIS
 
@@ -24,7 +24,7 @@ C<fhprint>, C<fhsay> C<print>, C<say>, C<errsay>, C<fatal>, C<f>, C<system>, C<v
 
 =item $class->can_output
 
-hook to be overidden if need be, for programs that do not want to keep
+hook to be overridden if need be, for programs that do not want to keep
 writing to the terminal in the background. Returns 1 by default.
 
 =back
diff --git a/usr.sbin/pkg_add/OpenBSD/State.pod b/usr.sbin/pkg_add/OpenBSD/State.pod
index 6e0666c7668..ae445c44f79 100644
--- a/usr.sbin/pkg_add/OpenBSD/State.pod
+++ b/usr.sbin/pkg_add/OpenBSD/State.pod
@@ -1,4 +1,4 @@
-$OpenBSD: State.pod,v 1.3 2022/02/12 09:46:19 espie Exp $
+$OpenBSD: State.pod,v 1.4 2022/12/28 21:30:18 jmc Exp $
 
 =head1 NAME
 
@@ -118,7 +118,7 @@ treatment (such as terminal redraw/reset) is needed.
 
 =item $state->sync_display
 
-hook to be overriden. Called by all the print functions prior to displaying
+hook to be overridden. Called by all the print functions prior to displaying
 anything. To be used to write things out cleanly (e.g., wipe out a 
 progressmeter line prior to writing an error message, for instance)
 
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index b46038cc592..20578c6435f 100644
--- a/usr.sbin/pkg_add/OpenBSD/Update.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Update.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Update.pm,v 1.167 2019/12/29 10:40:16 espie Exp $
+# $OpenBSD: Update.pm,v 1.168 2022/12/28 21:30:18 jmc Exp $
 #
 # Copyright (c) 2004-2014 Marc Espie <espie@openbsd.org>
 #
@@ -170,7 +170,7 @@ sub process_handle
 	}
 	# XXX all that code conveniently forgets about old versions, while
 	# marking them as "normal".
-	# there should be some error path when we consistenly fail to find
+	# there should be some error path when we consistently fail to find
 	# an equal-or-newer version in our repository, so that pkg_add has
 	# consistent exit codes.
 	if (!$state->defines('downgrade')) {
diff --git a/usr.sbin/pkg_add/package.5 b/usr.sbin/pkg_add/package.5
index 37a942f3d3e..53344502016 100644
--- a/usr.sbin/pkg_add/package.5
+++ b/usr.sbin/pkg_add/package.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: package.5,v 1.31 2022/06/04 10:12:38 espie Exp $
+.\"	$OpenBSD: package.5,v 1.32 2022/12/28 21:30:18 jmc Exp $
 .\" Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -12,7 +12,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: June 4 2022 $
+.Dd $Mdocdate: December 28 2022 $
 .Dt PACKAGE 5
 .Os
 .Sh NAME
@@ -156,7 +156,7 @@ of
 .Ar external
 .Sm on
 .Xc
-Record the date of signature of a package, synthetized by
+Record the date of signature of a package, synthesized by
 .Xr pkg_add 1
 from
 .Xr signify 1
@@ -208,7 +208,7 @@ to record the files's cryptographic checksum,
 as a sha256 digest encoded in base64.
 .Pp
 .It Cm @signer
-Record the signing key for a package, synthetized by
+Record the signing key for a package, synthesized by
 .Xr pkg_add 1
 from
 .Xr signify 1
@@ -225,7 +225,7 @@ Added after a file entry by
 to record that the entry is actually a symbolic link.
 .Pp
 .It Cm @url
-Original location of the package, synthetized by
+Original location of the package, synthesized by
 .Xr pkg_add 1
 during installation.
 .Pp
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 828f7cdce65..a66719484c4 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.29 2015/12/06 12:00:16 tobias Exp $	*/
+/*	$OpenBSD: options.c,v 1.30 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * options.c - handles option processing for PPP.
@@ -268,7 +268,7 @@ static struct cmd {
     {"-all", 0, noopt},		/* Don't request/allow any options (useless) */
     {"noaccomp", 0, noaccomp},	/* Disable Address/Control compression */
     {"-ac", 0, noaccomp},	/* Disable Address/Control compress */
-    {"default-asyncmap", 0, noasyncmap}, /* Disable asyncmap negoatiation */
+    {"default-asyncmap", 0, noasyncmap}, /* Disable asyncmap negotiation */
     {"-am", 0, noasyncmap},	/* Disable asyncmap negotiation */
     {"-as", 1, setasyncmap},	/* set the desired async map */
     {"-d", 0, setdebug},	/* Increase debugging level */
diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c
index 211a3883117..66ebf0c8ff5 100644
--- a/usr.sbin/rad/frontend.c
+++ b/usr.sbin/rad/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.41 2022/10/15 13:26:15 florian Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.42 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -1243,7 +1243,7 @@ build_packet(struct ra_iface *ra_iface)
 		/* scaled lifetime in units of 8 seconds */
 		sltime_plc = pref64->ltime / 8;
 		sltime_plc = sltime_plc << 3;
-		/* encode prefix lenght in lower 3 bits */
+		/* encode prefix length in lower 3 bits */
 		switch (pref64->prefixlen) {
 		case 96:
 			sltime_plc |= 0;
@@ -1280,7 +1280,7 @@ build_packet(struct ra_iface *ra_iface)
 	    != 0) {
 		memcpy(ra_iface->data, buf, len);
 		ra_iface->datalen = len;
-		/* packet changed; tell engine to send new advertisments */
+		/* packet changed; tell engine to send new advertisements */
 		if (event_initialized(&ra_iface->icmp6ev->ev))
 			frontend_imsg_compose_engine(IMSG_UPDATE_IF, 0,
 			    &ra_iface->if_index, sizeof(ra_iface->if_index));
diff --git a/usr.sbin/rad/rad.h b/usr.sbin/rad/rad.h
index 3af48dda5ad..e939ec091e2 100644
--- a/usr.sbin/rad/rad.h
+++ b/usr.sbin/rad/rad.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rad.h,v 1.23 2022/10/15 13:26:15 florian Exp $	*/
+/*	$OpenBSD: rad.h,v 1.24 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -111,7 +111,7 @@ struct ra_prefix_conf {
 	struct in6_addr			 prefix;	/* prefix */
 	int				 prefixlen;	/* prefix length */
 	uint32_t			 vltime;	/* valid lifetime */
-	uint32_t			 pltime;	/* prefered lifetime */
+	uint32_t			 pltime;	/* preferred lifetime */
 	int				 lflag;		/* on-link flag*/
 	int				 aflag;		/* autonom. addr flag */
 };
diff --git a/usr.sbin/radiusd/radiusd.c b/usr.sbin/radiusd/radiusd.c
index 4b01b310dbc..71702230896 100644
--- a/usr.sbin/radiusd/radiusd.c
+++ b/usr.sbin/radiusd/radiusd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radiusd.c,v 1.27 2019/06/28 13:32:49 deraadt Exp $	*/
+/*	$OpenBSD: radiusd.c,v 1.28 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -594,7 +594,7 @@ radiusd_access_request_answer(struct radius_query *q)
 
 	if (authen_secret == NULL) {
 		/*
-		 * The module couldn't check the autheticators
+		 * The module couldn't check the authenticators
 		 */
 		if (radius_check_response_authenticator(q->res,
 		    q->client->secret) != 0) {
@@ -1031,7 +1031,7 @@ radiusd_module_start(struct radiusd_module *module)
 				    module->name);
 		} else
 			log_warnx("Module `%s' could not started: module "
-			    "returned unknow message type %d", module->name,
+			    "returned unknown message type %d", module->name,
 			    imsg.hdr.type);
 		goto on_fail;
 	}
diff --git a/usr.sbin/radiusd/radiusd_radius.c b/usr.sbin/radiusd/radiusd_radius.c
index af83969dbb6..cbd44e93e02 100644
--- a/usr.sbin/radiusd/radiusd_radius.c
+++ b/usr.sbin/radiusd/radiusd_radius.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radiusd_radius.c,v 1.17 2019/06/28 13:32:49 deraadt Exp $	*/
+/*	$OpenBSD: radiusd_radius.c,v 1.18 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -537,7 +537,7 @@ module_radius_req_reset_event(struct module_radius_req *req)
 	}
 	if (evtimer_add(&req->ev, &tv) != 0) {
 		module_radius_log(req->module, LOG_WARNING,
-		    "Cannot proccess the request for q=%u: "
+		    "Cannot process the request for q=%u: "
 		    "evtimer_add() failed: %m", req->q_id);
 		module_radius_req_on_failure(req);
 		return (-1);
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index da4a1aa0cc1..7491570445d 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.254 2021/03/24 20:59:53 benno Exp $	*/
+/*	$OpenBSD: relay.c,v 1.255 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -1441,7 +1441,7 @@ relay_session(struct rsession *con)
 		 * Call the UDP protocol-specific handler
 		 */
 		if (rlay->rl_proto->request == NULL)
-			fatalx("invalide UDP session");
+			fatalx("invalid UDP session");
 		if ((*rlay->rl_proto->request)(con) == -1)
 			relay_close(con, "session failed", 1);
 		return;
@@ -2090,7 +2090,7 @@ relay_tls_ctx_create_proto(struct protocol *proto, struct tls_config *tls_cfg)
 
 	/*
 	 * Set session ID context to a random value. It needs to be the
-	 * same accross all relay processes or session caching will fail.
+	 * same across all relay processes or session caching will fail.
 	 */
 	if (tls_config_set_session_id(tls_cfg, env->sc_conf.tls_sid,
 	    sizeof(env->sc_conf.tls_sid)) == -1) {
diff --git a/usr.sbin/relayd/relay_udp.c b/usr.sbin/relayd/relay_udp.c
index 74d55feb794..e165bd7f5c1 100644
--- a/usr.sbin/relayd/relay_udp.c
+++ b/usr.sbin/relayd/relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.49 2018/08/06 17:31:31 benno Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.50 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org>
@@ -355,7 +355,7 @@ struct relay_dnshdr {
 	u_int8_t	dns_flags0;
 #define  DNS_F0_QR	0x80		/* response flag */
 #define  DNS_F0_OPCODE	0x78		/* message type */
-#define  DNS_F0_AA	0x04		/* authorative answer */
+#define  DNS_F0_AA	0x04		/* authoritative answer */
 #define  DNS_F0_TC	0x02		/* truncated message */
 #define  DNS_F0_RD	0x01		/* recursion desired */
 
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index ad4162b8898..032f7d1d746 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockd_lock.c,v 1.10 2019/06/28 13:32:50 deraadt Exp $	*/
+/*	$OpenBSD: lockd_lock.c,v 1.11 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -398,7 +398,7 @@ unlock(nlm4_lock *lck, int flags)
 			/* nothing to do */
 			break;
 		default:
-			syslog(LOG_NOTICE, "unknow status %d for %s",
+			syslog(LOG_NOTICE, "unknown status %d for %s",
 			    fl->status, fl->client_name);
 		}
 		sigunlock();
@@ -835,7 +835,7 @@ notify(const char *hostname, int state)
 			case LKST_DYING:
 				break;
 			default:
-				syslog(LOG_NOTICE, "unknow status %d for %s",
+				syslog(LOG_NOTICE, "unknown status %d for %s",
 				    fl->status, fl->client_name);
 			}
 		}
diff --git a/usr.sbin/rpki-client/cms.c b/usr.sbin/rpki-client/cms.c
index 795ebf7d412..1b2e6998885 100644
--- a/usr.sbin/rpki-client/cms.c
+++ b/usr.sbin/rpki-client/cms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cms.c,v 1.25 2022/11/29 20:41:32 job Exp $ */
+/*	$OpenBSD: cms.c,v 1.26 2022/12/28 21:30:18 jmc Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -95,7 +95,7 @@ cms_parse_validate_internal(X509 **xp, const char *fn, const unsigned char *der,
 	}
 
 	/*
-	 * The CMS is self-signed with a signing certifiate.
+	 * The CMS is self-signed with a signing certificate.
 	 * Verify that the self-signage is correct.
 	 */
 	if (!CMS_verify(cms, NULL, NULL, bio, NULL,
diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h
index d6c3b93de79..6bd5632fa3c 100644
--- a/usr.sbin/rpki-client/extern.h
+++ b/usr.sbin/rpki-client/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.164 2022/12/15 12:02:29 claudio Exp $ */
+/*	$OpenBSD: extern.h,v 1.165 2022/12/28 21:30:18 jmc Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -352,7 +352,7 @@ struct aspa {
 
 /*
  * A Validated ASPA Payload (VAP) tree element.
- * To ease transformation, this struct mimicks ASPA RTR PDU structure.
+ * To ease transformation, this struct mimics ASPA RTR PDU structure.
  */
 struct vap {
 	RB_ENTRY(vap)		 entry;
@@ -490,7 +490,7 @@ struct entity {
 	unsigned int	 repoid;	/* repository identifier */
 	int		 talid;		/* tal identifier */
 	enum rtype	 type;		/* type of entity (not RTYPE_EOF) */
-	enum location	 location;	/* which directroy the file lives in */
+	enum location	 location;	/* which directory the file lives in */
 };
 TAILQ_HEAD(entityq, entity);
 
diff --git a/usr.sbin/rpki-client/repo.c b/usr.sbin/rpki-client/repo.c
index f4a21430f34..059fbfceff6 100644
--- a/usr.sbin/rpki-client/repo.c
+++ b/usr.sbin/rpki-client/repo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: repo.c,v 1.40 2022/12/15 12:02:29 claudio Exp $ */
+/*	$OpenBSD: repo.c,v 1.41 2022/12/28 21:30:18 jmc Exp $ */
 /*
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -684,7 +684,7 @@ rrdp_save_state(unsigned int id, struct rrdp_session *state)
 
 	rr = rrdp_find(id);
 	if (rr == NULL)
-		errx(1, "non-existant rrdp repo %u", id);
+		errx(1, "non-existent rrdp repo %u", id);
 
 	file = rrdp_state_filename(rr, 0);
 	temp = rrdp_state_filename(rr, 1);
@@ -780,7 +780,7 @@ rrdp_clear(unsigned int id)
 
 	rr = rrdp_find(id);
 	if (rr == NULL)
-		errx(1, "non-existant rrdp repo %u", id);
+		errx(1, "non-existent rrdp repo %u", id);
 
 	/* remove rrdp repository contents */
 	remove_contents(rr->basedir);
@@ -804,7 +804,7 @@ rrdp_handle_file(unsigned int id, enum publish_type pt, char *uri,
 
 	rr = rrdp_find(id);
 	if (rr == NULL)
-		errx(1, "non-existant rrdp repo %u", id);
+		errx(1, "non-existent rrdp repo %u", id);
 	if (rr->state == REPO_FAILED)
 		return -1;
 
@@ -923,7 +923,7 @@ rsync_finish(unsigned int id, int ok)
 }
 
 /*
- * RRDP sync finshed, either with or without success.
+ * RRDP sync finished, either with or without success.
  */
 void
 rrdp_finish(unsigned int id, int ok)
@@ -967,7 +967,7 @@ http_finish(unsigned int id, enum http_result res, const char *last_mod)
 
 	tr = ta_find(id);
 	if (tr == NULL) {
-		/* not a TA fetch therefor RRDP */
+		/* not a TA fetch therefore RRDP */
 		rrdp_http_done(id, res, last_mod);
 		return;
 	}
diff --git a/usr.sbin/rpki-client/rsync.c b/usr.sbin/rpki-client/rsync.c
index ce1549a27d6..f1a4c181db9 100644
--- a/usr.sbin/rpki-client/rsync.c
+++ b/usr.sbin/rpki-client/rsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rsync.c,v 1.45 2022/11/29 20:26:22 job Exp $ */
+/*	$OpenBSD: rsync.c,v 1.46 2022/12/28 21:30:18 jmc Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -55,7 +55,7 @@ static TAILQ_HEAD(, rsync)	states = TAILQ_HEAD_INITIALIZER(states);
  * Return the base of a rsync URI (rsync://hostname/module). The
  * caRepository provided by the RIR CAs point deeper than they should
  * which would result in many rsync calls for almost every subdirectory.
- * This is inefficent so instead crop the URI to a common base.
+ * This is inefficient so instead crop the URI to a common base.
  * The returned string needs to be freed by the caller.
  */
 char *
diff --git a/usr.sbin/smtpd/smtp_client.c b/usr.sbin/smtpd/smtp_client.c
index 5c21bf385af..e03739eb08a 100644
--- a/usr.sbin/smtpd/smtp_client.c
+++ b/usr.sbin/smtpd/smtp_client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp_client.c,v 1.16 2021/06/14 17:58:16 eric Exp $	*/
+/*	$OpenBSD: smtp_client.c,v 1.17 2022/12/28 21:30:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2018 Eric Faurot <eric@openbsd.org>
@@ -224,7 +224,7 @@ smtp_client_free(struct smtp_client *proto)
 }
 
 /*
- * End the session immediatly.
+ * End the session immediately.
  */
 static void
 smtp_client_abort(struct smtp_client *proto, int err, const char *reason)
diff --git a/usr.sbin/snmpd/traphandler.c b/usr.sbin/snmpd/traphandler.c
index 8eb8f3439f2..c9affe0afad 100644
--- a/usr.sbin/snmpd/traphandler.c
+++ b/usr.sbin/snmpd/traphandler.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traphandler.c,v 1.23 2022/06/30 09:42:19 martijn Exp $	*/
+/*	$OpenBSD: traphandler.c,v 1.24 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 2014 Bret Stephen Lambert <blambert@openbsd.org>
@@ -194,7 +194,7 @@ traphandler_v1translate(struct snmp_message *msg, int proxy)
 		return NULL;
 	}
 
-	/* work aronud net-snmp's snmptrap: It adds an EOC element in vblist */
+	/* work around net-snmp's snmptrap: It adds an EOC element in vblist */
 	if (vblist->be_len != 0)
 		vb0 = ober_unlink_elements(vblist);
 
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index d846e19c259..6b079492917 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.275 2022/06/16 18:44:43 bluhm Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.276 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 2014-2021 Alexander Bluhm <bluhm@genua.de>
@@ -1151,7 +1151,7 @@ acceptcb(int lfd, short event, void *arg, int usetls)
 		log_debug("Malformed accept address");
 		peername = hostname_unknown;
 	}
-	log_debug("Peer addresss and port %s", peername);
+	log_debug("Peer address and port %s", peername);
 	if ((p = malloc(sizeof(*p))) == NULL) {
 		log_warn("allocate \"%s\"", peername);
 		close(fd);
@@ -3302,7 +3302,7 @@ ctlconn_writecb(int fd, short event, void *arg)
 	}
 
 	/*
-	 * Make space in the buffer for continous writes.
+	 * Make space in the buffer for continuous writes.
 	 * Set offset behind reply header to skip it
 	 */
 	*reply_text = '\0';
diff --git a/usr.sbin/tcpdump/igrp.h b/usr.sbin/tcpdump/igrp.h
index 99f323b7cdc..676b633ff8f 100644
--- a/usr.sbin/tcpdump/igrp.h
+++ b/usr.sbin/tcpdump/igrp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igrp.h,v 1.4 2000/10/03 14:31:55 ho Exp $	*/
+/*	$OpenBSD: igrp.h,v 1.5 2022/12/28 21:30:19 jmc Exp $	*/
 
 /* Cisco IGRP definitions */
 
@@ -16,7 +16,7 @@ struct igrphdr {
 	u_short ig_as;		/* autonomous system number */
 	u_short ig_ni;		/* number of subnet in local net */
 	u_short ig_ns;		/* number of networks in AS */
-	u_short ig_nx;		/* number of networks ouside AS */
+	u_short ig_nx;		/* number of networks outside AS */
 	u_short ig_sum;		/* checksum of IGRP header & data */
 };
 
diff --git a/usr.sbin/tcpdump/in_cksum.c b/usr.sbin/tcpdump/in_cksum.c
index 438cebf81af..2531ac0ca8a 100644
--- a/usr.sbin/tcpdump/in_cksum.c
+++ b/usr.sbin/tcpdump/in_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_cksum.c,v 1.2 2018/07/06 04:49:21 dlg Exp $	*/
+/*	$OpenBSD: in_cksum.c,v 1.3 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 1988, 1992, 1993
@@ -116,7 +116,7 @@ in_cksum_fini(uint32_t sum)
 
 /*
  * compute an IP header checksum.
- * don't modifiy the packet.
+ * don't modify the packet.
  */
 uint16_t
 in_cksum(const void *addr, size_t len, uint32_t sum)
diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c
index 3313aaa594a..6869159d696 100644
--- a/usr.sbin/tcpdump/print-icmp6.c
+++ b/usr.sbin/tcpdump/print-icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-icmp6.c,v 1.24 2022/01/05 05:33:14 dlg Exp $	*/
+/*	$OpenBSD: print-icmp6.c,v 1.25 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -139,7 +139,7 @@ icmp6_print(const u_char *bp, u_int length, const u_char *bp2)
 	dp = (struct icmp6_hdr *)bp;
 	ip = (struct ip6_hdr *)bp2;
 	oip = (struct ip6_hdr *)(dp + 1);
-	/* 'ep' points to the end of avaible data. */
+	/* 'ep' points to the end of available data. */
 	ep = snapend;
 	if (ip->ip6_plen)
 		icmp6len = (ntohs(ip->ip6_plen) + sizeof(struct ip6_hdr) -
@@ -234,7 +234,7 @@ icmp6_print(const u_char *bp, u_int length, const u_char *bp2)
 		TCHECK(oip->ip6_dst);
 		switch (dp->icmp6_code) {
 		case ICMP6_PARAMPROB_HEADER:
-			printf("icmp6: parameter problem errorneous - octet %u",
+			printf("icmp6: parameter problem erroneous - octet %u",
 			    (u_int32_t)ntohl(dp->icmp6_pptr));
 			break;
 		case ICMP6_PARAMPROB_NEXTHEADER:
@@ -545,7 +545,7 @@ icmp6_opt_print(const u_char *bp, int resid)
 	ip = (struct ip6_hdr *)bp2;
 	oip = &dp->icmp6_ip6;
 #endif
-	/* 'ep' points to the end of avaible data. */
+	/* 'ep' points to the end of available data. */
 	ep = snapend;
 
 	ECHECK(op->nd_opt_len);
@@ -727,7 +727,7 @@ mld6_print(const u_char *bp)
 	struct mld_hdr *mp = (struct mld_hdr *)bp;
 	const u_char *ep;
 
-	/* 'ep' points to the end of avaible data. */
+	/* 'ep' points to the end of available data. */
 	ep = snapend;
 
 	if ((u_char *)mp + sizeof(*mp) > ep)
diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c
index fcfc66dc8ef..3a687bc92a1 100644
--- a/usr.sbin/tcpdump/print-ike.c
+++ b/usr.sbin/tcpdump/print-ike.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-ike.c,v 1.40 2021/12/01 18:28:46 deraadt Exp $	*/
+/*	$OpenBSD: print-ike.c,v 1.41 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -198,7 +198,7 @@ ike_print (const u_int8_t *cp, u_int length)
 	if (length < sizeof (struct isakmp_header))
 		goto trunc;
 
-	/* 'ep' points to the end of avaible data. */
+	/* 'ep' points to the end of available data. */
 	ep = snapend;
 
 	printf("isakmp v%u.%u", ih->version >> 4, ih->version & 0xf);
diff --git a/usr.sbin/tcpdump/print-lwres.c b/usr.sbin/tcpdump/print-lwres.c
index 81e768c3ba9..7d980501223 100644
--- a/usr.sbin/tcpdump/print-lwres.c
+++ b/usr.sbin/tcpdump/print-lwres.c
@@ -103,7 +103,7 @@ typedef struct lwres_addr lwres_addr_t;
 struct lwres_addr {
 	lwres_uint32_t			family;
 	lwres_uint16_t			length;
-	/* address folows */
+	/* address follows */
 };
 
 typedef struct {
diff --git a/usr.sbin/tcpdump/print-nhrp.c b/usr.sbin/tcpdump/print-nhrp.c
index f8b8bd620e4..c84053581a3 100644
--- a/usr.sbin/tcpdump/print-nhrp.c
+++ b/usr.sbin/tcpdump/print-nhrp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-nhrp.c,v 1.1 2020/04/15 20:19:25 remi Exp $ */
+/*	$OpenBSD: print-nhrp.c,v 1.2 2022/12/28 21:30:19 jmc Exp $ */
 
 /*
  * Copyright (c) 2020 Remi Locherer <remi@openbsd.org>
@@ -148,7 +148,7 @@ nhrp_print(const u_char *p, u_int length)
 	if (vflag) {
 		printf(", hopcnt %u", hdr->hopcnt);
 
-		/* most significat bit must be 0 */
+		/* most significant bit must be 0 */
 		if (hdr->shtl & 0x80)
 			printf(" (shtl bit 7 set)");
 
diff --git a/usr.sbin/tcpdump/print-rt6.c b/usr.sbin/tcpdump/print-rt6.c
index f0359d81be5..acd39378534 100644
--- a/usr.sbin/tcpdump/print-rt6.c
+++ b/usr.sbin/tcpdump/print-rt6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-rt6.c,v 1.9 2022/01/05 05:36:37 dlg Exp $	*/
+/*	$OpenBSD: print-rt6.c,v 1.10 2022/12/28 21:30:19 jmc Exp $	*/
 
 
 /*
@@ -55,7 +55,7 @@ rt6_print(const u_char *bp, const u_char *bp2)
 	dp = (struct ip6_rthdr *)bp;
 	len = dp->ip6r_len;
 
-	/* 'ep' points to the end of avaible data. */
+	/* 'ep' points to the end of available data. */
 	ep = snapend;
 
 #if 0
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 5be9c69e0d6..8c5de8cf390 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs.c,v 1.35 2022/10/28 11:24:49 dlg Exp $	*/
+/*	$OpenBSD: usbdevs.c,v 1.36 2022/12/28 21:30:19 jmc Exp $	*/
 /*	$NetBSD: usbdevs.c,v 1.19 2002/02/21 00:34:31 christos Exp $	*/
 
 /*
@@ -155,7 +155,7 @@ dump_device(int fd, uint8_t addr)
 				printf(" enabled");
 
 			if (status & UPS_SUSPEND)
-				printf(" supsend");
+				printf(" suspend");
 
 			if (status & UPS_OVERCURRENT_INDICATOR)
 				printf(" overcurrent");
diff --git a/usr.sbin/user/main.c b/usr.sbin/user/main.c
index dde2371a9a9..54d8410d0c4 100644
--- a/usr.sbin/user/main.c
+++ b/usr.sbin/user/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.11 2016/11/29 03:59:31 jsg Exp $ */
+/* $OpenBSD: main.c,v 1.12 2022/12/28 21:30:19 jmc Exp $ */
 /* $NetBSD: main.c,v 1.3 2002/07/09 10:34:16 tron Exp $ */
 
 /*
@@ -47,7 +47,7 @@ typedef struct cmd_t {
 	int		(*c_func)(int, char **);	/* called function */
 } cmd_t;
 
-/* despatch table for commands */
+/* dispatch table for commands */
 static cmd_t	cmds[] = {
 	{	1,	{ "useradd",	NULL },		useradd		},
 	{	2,	{ "user",	"add" },	useradd		},
diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index 95e5e96545f..d03384611ab 100644
--- a/usr.sbin/vmd/loadfile_elf.c
+++ b/usr.sbin/vmd/loadfile_elf.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.44 2022/12/26 23:50:20 dv Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.45 2022/12/28 21:30:19 jmc Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -186,7 +186,7 @@ push_gdt(void)
 	/*
 	 * Create three segment descriptors:
 	 *
-	 * GDT[0] : null desriptor. "Created" via memset above.
+	 * GDT[0] : null descriptor. "Created" via memset above.
 	 * GDT[1] (selector @ 0x8): Executable segment, for CS
 	 * GDT[2] (selector @ 0x10): RW Data segment, for DS/ES/SS
 	 */
diff --git a/usr.sbin/vmd/mmio.c b/usr.sbin/vmd/mmio.c
index 7348fbf0a11..2de5dcefa3a 100644
--- a/usr.sbin/vmd/mmio.c
+++ b/usr.sbin/vmd/mmio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mmio.c,v 1.1 2022/11/10 11:46:39 dv Exp $	*/
+/*	$OpenBSD: mmio.c,v 1.2 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 2022 Dave Voutila <dv@openbsd.org>
@@ -387,7 +387,7 @@ detect_cpu_mode(struct vcpu_reg_state *vrs)
 			log_warnx("%s: invalid cpu mode", __progname);
 			return (VMM_CPU_MODE_UNKNOWN);
 		} else {
-			/* Compatability Modes */
+			/* Compatibility Modes */
 			if (cs & CS_D) /* XXX Add Compat32 mode */
 				return (VMM_CPU_MODE_UNKNOWN);
 			return (VMM_CPU_MODE_COMPAT);
diff --git a/usr.sbin/vmd/ns8250.c b/usr.sbin/vmd/ns8250.c
index 37da93545e6..dbb6568714c 100644
--- a/usr.sbin/vmd/ns8250.c
+++ b/usr.sbin/vmd/ns8250.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns8250.c,v 1.33 2022/12/19 20:27:26 dv Exp $ */
+/* $OpenBSD: ns8250.c,v 1.34 2022/12/28 21:30:19 jmc Exp $ */
 /*
  * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -326,7 +326,7 @@ vcpu_process_com_data(struct vm_exit *vei, uint32_t vm_id, uint32_t vcpu_id)
  *
  * Emulate in/out instructions to the com1 (ns8250) UART line control register
  *
- * Paramters:
+ * Parameters:
  *  vei: vm exit information from vmm(4) containing information on the in/out
  *      instruction being performed
  */
diff --git a/usr.sbin/vmd/virtio.c b/usr.sbin/vmd/virtio.c
index 501c1c8c94e..0ae0fef066b 100644
--- a/usr.sbin/vmd/virtio.c
+++ b/usr.sbin/vmd/virtio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio.c,v 1.98 2022/12/23 19:25:22 dv Exp $	*/
+/*	$OpenBSD: virtio.c,v 1.99 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -1550,7 +1550,7 @@ vmmci_ack(unsigned int cmd)
 		/* FALLTHROUGH */
 	case VMMCI_REBOOT:
 		/*
-		 * If the VM acknowleged our shutdown request, give it
+		 * If the VM acknowledged our shutdown request, give it
 		 * enough time to shutdown or reboot gracefully.  This
 		 * might take a considerable amount of time (running
 		 * rc.shutdown on the VM), so increase the timeout before
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c
index befee2e350c..321d8858ca1 100644
--- a/usr.sbin/vmd/vm.c
+++ b/usr.sbin/vmd/vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.c,v 1.78 2022/12/26 23:50:20 dv Exp $	*/
+/*	$OpenBSD: vm.c,v 1.79 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -274,7 +274,7 @@ loadfile_bios(gzFile fp, off_t size, struct vcpu_reg_state *vrs)
  *
  * 1. validates and create the new VM
  * 2. opens the imsg control channel to the parent and drops more privilege
- * 3. drops additional privleges by calling pledge(2)
+ * 3. drops additional privileges by calling pledge(2)
  * 4. loads the kernel from the disk image or file descriptor
  * 5. runs the VM's VCPU loops.
  *
@@ -563,7 +563,7 @@ send_vm(int fd, struct vm_create_params *vcp)
 
 	vmc = calloc(1, sizeof(struct vmop_create_params));
 	if (vmc == NULL) {
-		log_warn("%s: calloc error geting vmc", __func__);
+		log_warn("%s: calloc error getting vmc", __func__);
 		ret = -1;
 		goto err;
 	}
@@ -1597,7 +1597,7 @@ vcpu_pic_intr(uint32_t vm_id, uint32_t vcpu_id, uint8_t intr)
  * Handle all I/O to the emulated PCI subsystem.
  *
  * Parameters:
- *  vrp: vcpu run paramters containing guest state for this exit
+ *  vrp: vcpu run parameters containing guest state for this exit
  *
  * Return value:
  *  Interrupt to inject to the guest VM, or 0xFF if no interrupt should
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index c7e22c0011a..6bffb2519a3 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmd.c,v 1.134 2022/12/15 16:01:40 dv Exp $	*/
+/*	$OpenBSD: vmd.c,v 1.135 2022/12/28 21:30:19 jmc Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -393,7 +393,7 @@ vmd_dispatch_vmm(int fd, struct privsep_proc *p, struct imsg *imsg)
 			    imsg->hdr.type, vm->vm_peerid, -1,
 			    &vmr, sizeof(vmr)) == -1) {
 				errno = vmr.vmr_result;
-				log_warn("%s: failed to foward vm result",
+				log_warn("%s: failed to forward vm result",
 				    vcp->vcp_name);
 				vm_remove(vm, __func__);
 				return (-1);
@@ -1671,7 +1671,7 @@ vm_checkperm(struct vmd_vm *vm, struct vmop_owner *vmo, uid_t uid)
 /*
  * vm_checkinsflag
  *
- * Checks wheter the non-root user is allowed to set an instance option.
+ * Checks whether the non-root user is allowed to set an instance option.
  *
  * Parameters:
  *  vmc: the VM create parameters
diff --git a/usr.sbin/wsmoused/mouse_protocols.c b/usr.sbin/wsmoused/mouse_protocols.c
index 7ac79f8d77a..3da20bb8af9 100644
--- a/usr.sbin/wsmoused/mouse_protocols.c
+++ b/usr.sbin/wsmoused/mouse_protocols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mouse_protocols.c,v 1.18 2022/01/28 06:33:27 guenther Exp $ */
+/* $OpenBSD: mouse_protocols.c,v 1.19 2022/12/28 21:30:19 jmc Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -317,7 +317,7 @@ pnpgets(int mouse_fd, char *buf)
 		ioctl(mouse_fd, TIOCMBIC, &i);
 		usleep(200000);
 
-		/* wait for respose, 2nd phase (2.1.6) */
+		/* wait for response, 2nd phase (2.1.6) */
 		FlushInput(mouse_fd);
 		i = TIOCM_DTR | TIOCM_RTS;	/* DTR = 1, RTS = 1 */
 		ioctl(mouse_fd, TIOCMBIS, &i);
@@ -573,7 +573,7 @@ mouse_init(void)
 	 **
 	 ** The following lines take care of the Logitech MouseMan protocols.
 	 **
-	 ** NOTE: There are diffrent versions of both MouseMan and TrackMan!
+	 ** NOTE: There are different versions of both MouseMan and TrackMan!
 	 **       Hence I add another protocol P_LOGIMAN, which the user can
 	 **       specify as MouseMan in his XF86Config file. This entry was
 	 **       formerly handled as a special case of P_MS. However, people
diff --git a/usr.sbin/wsmoused/mouse_protocols.h b/usr.sbin/wsmoused/mouse_protocols.h
index 11a586fad9e..2f5b81c42a7 100644
--- a/usr.sbin/wsmoused/mouse_protocols.h
+++ b/usr.sbin/wsmoused/mouse_protocols.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mouse_protocols.h,v 1.6 2009/06/05 03:37:10 miod Exp $ */
+/* $OpenBSD: mouse_protocols.h,v 1.7 2022/12/28 21:30:19 jmc Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -86,7 +86,7 @@
  * - synchronization mask
  * - synchronization value (must be equal to data ANDed with SYNCMASK)
  * - mask of buttons
- * - mask of each button separetely
+ * - mask of each button separately
  */
 
 /* Microsoft Serial mouse data packet */
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index fba44efc78f..f121bd6ddd7 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.76 2022/07/17 03:12:20 deraadt Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.77 2022/12/28 21:30:19 jmc Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -995,7 +995,7 @@ rpc_received(char *dom, struct sockaddr_in *raddrp, int force)
 		return;
 	}
 
-	/* syncronously ask for the matching ypserv TCP port number */
+	/* synchronously ask for the matching ypserv TCP port number */
 	ypserv_udp = raddrp->sin_port;
 	ypserv_tcp = pmap_getport(raddrp, YPPROG,
 	    YPVERS, IPPROTO_TCP);
diff --git a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
index d488f454094..2e7ace857bf 100644
--- a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
+++ b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse_netgroup.c,v 1.13 2015/12/08 07:16:33 mmcc Exp $ */
+/* $OpenBSD: parse_netgroup.c,v 1.14 2022/12/28 21:30:19 jmc Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -185,7 +185,7 @@ parse_netgrp(char *group)
 	if (lp->l_parsed) {
 #ifdef DEBUG
 		/*
-		 * This error message is largely superflous since the
+		 * This error message is largely superfluous since the
 		 * code handles the error condition successfully, and
 		 * spewing it out from inside libc can actually hose
 		 * certain programs.
diff --git a/usr.sbin/ypserv/ypserv/acl.c b/usr.sbin/ypserv/ypserv/acl.c
index 75d8a7ee8de..2cba27a2c92 100644
--- a/usr.sbin/ypserv/ypserv/acl.c
+++ b/usr.sbin/ypserv/ypserv/acl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acl.c,v 1.16 2018/04/26 12:48:10 schwarze Exp $ */
+/*	$OpenBSD: acl.c,v 1.17 2022/12/28 21:30:19 jmc Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -349,7 +349,7 @@ acl_init(char *file)
 		switch (state) {
 		case ACLE_NONETMASK:
 			fprintf(stderr,
-			    "acl: excpected \"netmask\" missing at line %d\n",
+			    "acl: expected \"netmask\" missing at line %d\n",
 			    line_no);
 			break;
 		case ACLE_NONET: