From: Michal Nowak <mnowak@isc.org>
Date: Sun, 24 May 2026 07:00:21 +0000 (+0000)
Subject: Fix spelling typos in comments and code
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=36fe37f6b4c1d7948ec128eee0cd60ccd30b1037;p=thirdparty%2Fbind9.git

Fix spelling typos in comments and code

Assisted-by: Mistral Vibe:mistral-medium-3.5
Assisted-by: Claude:claude-opus-4-7
---

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 683473815fe..4abf054823f 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -61,7 +61,7 @@
 #include "dnssectool.h"
 
 /*
- * These are are set here for backwards compatibility.  They are
+ * These are set here for backwards compatibility.  They are
  * raised to 2048 in FIPS mode.
  */
 static int min_rsa = 1024;
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 33fc35ac019..71a89991e08 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -2740,7 +2740,7 @@ findkeys:
 	dns_diff_init(isc_g_mctx, &diff);
 
 	/*
-	 * Update keylist with information from from the key repository.
+	 * Update keylist with information from the key repository.
 	 */
 	dns_dnssec_updatekeys(&keylist, &matchkeys, NULL, gorigin, keyttl,
 			      &diff, isc_g_mctx, report);
diff --git a/bin/named/server.c b/bin/named/server.c
index 906e108b9a4..ef02634b6b7 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8788,7 +8788,7 @@ cleanup_portsets:
 cleanup_tls:
 	/*
 	 * Detach the TLS client context (whether the one created at the
-	 * begining of this function, or the previous running one)
+	 * beginning of this function, or the previous running one)
 	 */
 	isc_tlsctx_cache_detach(&tlsctx_client_cache);
 
diff --git a/bin/plugins/synthrecord.c b/bin/plugins/synthrecord.c
index fc2f79450bb..4f7bff17b40 100644
--- a/bin/plugins/synthrecord.c
+++ b/bin/plugins/synthrecord.c
@@ -73,7 +73,7 @@ synthrecord_reverseanswer(synthrecord_t *inst, isc_netaddr_t *na,
 	RETERR(isc_netaddr_totext(na, &addrb));
 
 	/*
-	 * IDN compatibility, as an IPv6 begining or ending with `::` will be
+	 * IDN compatibility, as an IPv6 beginning or ending with `::` will be
 	 * converted into `--` and RFC5890 section 2.3.1 states that an IDN
 	 * label can't start or end with an hyphen.
 	 */
diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 73997fb5210..b731432678b 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -704,7 +704,7 @@ dns__catz_zones_merge(dns_catz_zone_t *catz, dns_catz_zone_t *newcatz) {
 	}
 	RUNTIME_CHECK(result == ISC_R_NOMORE);
 	isc_ht_iter_destroy(&iter2);
-	/* At this moment catz->entries has to be be empty. */
+	/* At this moment catz->entries has to be empty. */
 	INSIST(isc_ht_count(catz->entries) == 0);
 	isc_ht_destroy(&catz->entries);
 
diff --git a/lib/dns/deleg.c b/lib/dns/deleg.c
index 69e7b1720bd..0566f2fe062 100644
--- a/lib/dns/deleg.c
+++ b/lib/dns/deleg.c
@@ -648,8 +648,8 @@ dns_delegset_insert(dns_delegdb_t *delegdb, const dns_name_t *zonecut,
 	if (result == ISC_R_SUCCESS) {
 		/*
 		 * A node at the same zonecut exists, and it is expired. Ignore
-		 * the return value, in case the overriden node would be removed
-		 * in meantime by someone else.
+		 * the return value, in case the overridden node would be
+		 * removed in meantime by someone else.
 		 */
 		(void)dns_qp_deletename(qp, zonecut, DNS_DBNAMESPACE_NORMAL,
 					NULL, NULL);
diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c
index 92c43999989..95df951c909 100644
--- a/lib/dns/dns64.c
+++ b/lib/dns/dns64.c
@@ -304,7 +304,7 @@ done:
 }
 
 /*
- * Posible mapping of IPV4ONLY.ARPA A records into AAAA records
+ * Possible mapping of IPV4ONLY.ARPA A records into AAAA records
  * for valid RFC6052 prefixes.
  */
 static struct {
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 22af41ef900..f7a6a9ca7f4 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -608,7 +608,7 @@ dns_dnssec_keyactive(dst_key_t *key, isc_stdtime_t now) {
 }
 
 /*%<
- * Indicate whether a key is scheduled to to have CDS/CDNSKEY records
+ * Indicate whether a key is scheduled to have CDS/CDNSKEY records
  * published now.
  *
  * Returns true if.
@@ -660,7 +660,7 @@ syncpublish(dst_key_t *key, isc_stdtime_t now) {
 }
 
 /*%<
- * Indicate whether a key is scheduled to to have CDS/CDNSKEY records
+ * Indicate whether a key is scheduled to have CDS/CDNSKEY records
  * deleted now.
  *
  * Returns true if:
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 82abbf98f57..4af2eed0e1b 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -217,7 +217,7 @@ struct dns_adbaddrinfo {
 };
 
 /*!<
- * When the caller recieves a callback from dns_adb_createfind(), the
+ * When the caller receives a callback from dns_adb_createfind(), the
  * argument will a pointer to the dns_adbfind_t structure, which includes
  * this includes a copy of the callback function and argument passed to
  * dns_adb_createfind(), and a dns_adbstatus_t in the 'status' field,
diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index 9ca1b98327f..05aa2955d41 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -51,7 +51,7 @@
  */
 
 /*
- * Logarithms of hash set sizes. In the usual (small) case, allow for for a
+ * Logarithms of hash set sizes. In the usual (small) case, allow for a
  * few dozen names in the hash set. (We can't actually use every slot because
  * space is reserved for performance reasons.) For large messages, the number
  * of names is limited by the minimum size of an RR (owner, type, class, ttl,
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 83ea893d293..90cd159a3b0 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -677,7 +677,7 @@ dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp);
  *
  * \li	'db' is a valid database with zone semantics.
  *
- * \li	versionp != NULL && *verisonp == NULL
+ * \li	versionp != NULL && *versionp == NULL
  *
  * Ensures:
  *
@@ -694,7 +694,7 @@ dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp);
  *
  * \li	'db' is a valid database with zone semantics.
  *
- * \li	versionp != NULL && *verisonp == NULL
+ * \li	versionp != NULL && *versionp == NULL
  *
  * Ensures:
  *
diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index f7cc6eaf273..1ee127115b3 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -193,7 +193,7 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
  *
  * Note: a NULL transport is different from a non-NULL transport of type
  *	 DNS_TRANSPORT_TCP, though currently their behavior is the same.
- *	 This allows for different types of transactions to be seperated
+ *	 This allows for different types of transactions to be separated
  *	 in the future if needed.
  *
  * Requires:
diff --git a/lib/dns/include/dns/nametree.h b/lib/dns/include/dns/nametree.h
index 98a230e6bf6..d603f5a97c2 100644
--- a/lib/dns/include/dns/nametree.h
+++ b/lib/dns/include/dns/nametree.h
@@ -80,10 +80,10 @@ dns_nametree_add(dns_nametree_t *nametree, const dns_name_t *name,
  * as dns_nametree_add() before the name is removed from the tree.
  *
  * If the nametree type was set to DNS_NAMETREE_BITS, then 'value' is
- * a bit number within a bit field, which is sized to accomodate at least
+ * a bit number within a bit field, which is sized to accommodate at least
  * 'value' bits. If the name already exists, then that bit will be set
  * in the bitfield, other bits will be retained, and ISC_R_SUCCESS will be
- * returned. If 'value' excees the number of bits in the existing bit
+ * returned. If 'value' exceeds the number of bits in the existing bit
  * field, the field will be expanded.
  *
  * Requires:
diff --git a/lib/dns/include/dns/qp.h b/lib/dns/include/dns/qp.h
index b88451a64da..700fb3a7732 100644
--- a/lib/dns/include/dns/qp.h
+++ b/lib/dns/include/dns/qp.h
@@ -332,7 +332,7 @@ typedef enum dns_qpgc {
 
 /***********************************************************************
  *
- *  functions - create, destory, enquire
+ *  functions - create, destroy, enquire
  */
 
 void
diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index a38e5ceaf7f..82b9692b8b4 100644
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -111,7 +111,7 @@ dns_rdatalist_fromrdataset(dns_rdataset_t   *rdataset,
  * The following are implementation functions for list-based rdatasets.
  * They are called by rdataset implementations in rdatalist.c, sdlz.c,
  * and builtin.c. They are not meant to be used directly by callers of
- * those implmentations.
+ * those implementations.
  */
 void
 dns_rdatalist_disassociate(dns_rdataset_t *rdatasetp DNS__DB_FLARG);
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 974f94aa2a3..39b283aaed0 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -151,7 +151,7 @@ typedef isc_result_t (*dns_sdlzfindzone_t)(void *driverarg, void *dbdata,
 /*%<
  * Method prototype.  Drivers implementing the SDLZ interface MUST
  * supply a find zone method.  This method is called when the DNS
- * server is performing a query to to determine if 'name' is a
+ * server is performing a query to determine if 'name' is a
  * supported dns zone.  The find zone method will be called with the
  * longest possible name first, and continue to be called with
  * successively shorter domain names, until any of the following
@@ -336,7 +336,7 @@ dns_sdlz_putsoa_t dns_sdlz_putsoa;
 /*%<
  * This function may optionally be called from the 'authority'
  * callback to simplify construction of the SOA record for 'zone'.  It
- * will provide a SOA listing 'mname' as as the primary server and
+ * will provide a SOA listing 'mname' as the primary server and
  * 'rname' as the responsible person mailbox.  It is the
  * responsibility of the driver to increment the serial number between
  * responses if necessary.  All other SOA fields will have reasonable
diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h
index e3910436166..228b3aec161 100644
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -144,7 +144,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer,
  *		In dns_ssutable_checkrules(), 'addr' should only be
  *		set if the request received via TCP.  This provides a
  *		weak assurance that the request was not spoofed.
- *		'addr' is to to validate dns_ssumatchtype_tcpself
+ *		'addr' is to validate dns_ssumatchtype_tcpself
  *		and dns_ssumatchtype_6to4self rules.
  *
  *		In dns_ssutable_checkrules2(), 'addr' can also be passed for
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 86b8dd76702..cd72ed429d0 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -125,7 +125,7 @@ dns_tsigkey_createfromkey(const dns_name_t *name, dst_algorithm_t algorithm,
  *	and will not expire if inception == expire.
  *
  *	If generated is true (meaning the key was generated
- *	via TKEY negotation), the creating identity (if any), should
+ *	via TKEY negotiation), the creating identity (if any), should
  *	be specified in the creator parameter.
  *
  *	If restored is true, this indicates the key was restored from
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 36a837b16b2..7ec6fb31653 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -363,7 +363,7 @@ dns_zone_dumptostream(dns_zone_t *zone, FILE *fd, dns_masterformat_t format,
  *    and 'rawversion' is ignored.
  *
  *    If 'format' is dns_masterformat_raw, 'style' is ignored, and
- *    'rawversion" specifies the format verson of the raw zone file:
+ *    'rawversion" specifies the format version of the raw zone file:
  *    version 0 raw files can be read by all BIND 9 releases;
  *    version 1 was introduced in BIND 9.9.
  *
@@ -551,7 +551,7 @@ dns_zone_findkeys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
  * Requires:
  *\li	'zone' to be a valid initialised zone.
  *\li	'mctx' is not NULL.
- *\li	'keys' is not NULL and has enough space form 'nkeys' keys.
+ *\li	'keys' is not NULL and has enough space for 'nkeys' keys.
  *\li	'nkeys' is not NULL.
  *
  * Returns:
diff --git a/lib/dns/include/dns/zoneproperties.h b/lib/dns/include/dns/zoneproperties.h
index 524ae33132b..e509c658dee 100644
--- a/lib/dns/include/dns/zoneproperties.h
+++ b/lib/dns/include/dns/zoneproperties.h
@@ -1174,7 +1174,7 @@ dns_zone_setcheckisservedby(dns_zone_t		     *zone,
 /*%<
  *	Set the post load integrity callback function 'checkisserverby'.
  *	'checkisserverby' will be called if the NS TARGET is not within
- *	the zone and there are A or AAAA records in the the zone.
+ *	the zone and there are A or AAAA records in the zone.
  *
  * Require:
  *	'zone' to be a valid zone.
diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index 622b564f121..8c7f3f8afa8 100644
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -1283,7 +1283,7 @@ dst_algorithm_fromdata(dns_secalg_t algorithm, unsigned char *data,
 		       unsigned int length);
 /*%<
  * If 'algorithm' is PRIVATEOID or PRIVATEDNS, extract the DNSSEC private
- * algorithm encoded at the begining of data and return the DST algorithm
+ * algorithm encoded at the beginning of data and return the DST algorithm
  * number that corresponds to it; if the algorithm is unknown to DST,
  * return 0.
  *
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 000a33977e8..1bb3f40f654 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1281,7 +1281,7 @@ dns_name_fromwire(dns_name_t *const name, isc_buffer_t *const source,
 	 *
 	 * > In this scheme, an entire domain name or a list of labels at the
 	 * > end of a domain name is replaced with a pointer to a prior
-	 * > occurance of the same name.
+	 * > occurrence of the same name.
 	 *
 	 * The key word is "prior". This says that compression pointers must
 	 * point strictly earlier in the message (before our "marker" variable),
diff --git a/lib/dns/qp.c b/lib/dns/qp.c
index 3317514f25d..b2258bc2b9c 100644
--- a/lib/dns/qp.c
+++ b/lib/dns/qp.c
@@ -152,7 +152,7 @@ uint16_t dns_qp_bits_for_byte[BYTE_VALUES] = { 0 };
  *
  * This table only handles the first bit in an escape sequence; we
  * arrange that we can calculate the byte value for both bits by
- * adding the the second bit to the first bit's byte value.
+ * adding the second bit to the first bit's byte value.
  */
 uint8_t dns_qp_byte_for_bit[SHIFT_OFFSET] = { 0 };
 
diff --git a/lib/dns/qp_p.h b/lib/dns/qp_p.h
index ef9f1e33621..21d7586ab0e 100644
--- a/lib/dns/qp_p.h
+++ b/lib/dns/qp_p.h
@@ -52,7 +52,7 @@
  * In a branch node:
  * - The 64-bit word is subdivided into three portions: the least
  *   significant bits are the node type (for a branch, 0x1); the
- *   most sigificant 15 bits are an offset value into the key, and
+ *   most significant 15 bits are an offset value into the key, and
  *   the 47 bits in the middle are a bitmap; see the documentation
  *   for the SHIFT_* enum below.
  * - The 32-bit word is a reference (dns_qpref_t) to the packed sparse
@@ -820,7 +820,7 @@ zero_twigs(dns_qpnode_t *twigs, dns_qpweight_t size) {
  *
  * Packed reader nodes save us from having to track `dns_qpread_t`
  * objects as distinct allocations: the packed reader nodes get
- * reclaimed when the the chunk containing their cells is reclaimed.
+ * reclaimed when the chunk containing their cells is reclaimed.
  * When a real `dns_qpread_t` object is needed, it is allocated on the
  * stack (it must not live longer than a isc_loop callback) and the
  * packed reader is unpacked into it.
diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index eb85d5092c2..04962e94749 100644
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -126,7 +126,7 @@ struct qpcnode {
 	 * and the database have both released the object) the object
 	 * is freed.
 	 *
-	 * Whenever 'erefs' is incremented from zero, we also aquire a
+	 * Whenever 'erefs' is incremented from zero, we also acquire a
 	 * node use reference (see 'qpcache->references' below), and
 	 * release it when 'erefs' goes back to zero. This prevents the
 	 * database from being shut down until every caller has released
diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index dce80a32ff6..be6b29a5ffb 100644
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -192,7 +192,7 @@ struct qpznode {
 	 * and the database have both released the object) the object
 	 * is freed.
 	 *
-	 * Whenever 'erefs' is incremented from zero, we also aquire a
+	 * Whenever 'erefs' is incremented from zero, we also acquire a
 	 * node use reference (see 'qpzonedb->references' below), and
 	 * release it when 'erefs' goes back to zero. This prevents the
 	 * database from being shut down until every caller has released
@@ -2664,7 +2664,7 @@ findnodeintree(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name,
 		INSIST(node->nspace == DNS_DBNAMESPACE_NSEC3 || !nsec3);
 	}
 	/*
-	 * ... if the lookup is unsucessful, and the caller didn't ask us
+	 * ... if the lookup is unsuccessful, and the caller didn't ask us
 	 * to create a new node, there is nothing to do. Return the result
 	 * of the lookup to the caller, and set *nodep to NULL
 	 */
@@ -4373,7 +4373,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) {
 		/* FALLTHROUGH */
 	case nonsec3:
 		/*
-		 * The final non-nsec node is before the the NSEC origin node.
+		 * The final non-nsec node is before the NSEC origin node.
 		 */
 		result = dns_qp_lookup(qpdbiter->snap, &qpdb->common.origin,
 				       DNS_DBNAMESPACE_NSEC, &qpdbiter->iter,
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 1b1f6f02fc2..4eb059e5ee4 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -230,7 +230,7 @@ checkowner_in_a(ARGS_CHECKOWNER) {
 		}
 
 		/*
-		 * Handle SPF exists targets when the seperating label is:
+		 * Handle SPF exists targets when the separating label is:
 		 * - "_spf" RFC7208, section 5.7
 		 * - "_spf_verify" RFC7208, Appendix D1
 		 * - "_spf_rate" RFC7208, Appendix D1
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index b41a9726ca3..258b8bf076c 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2021,7 +2021,7 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
 	}
 
 	/*
-	 * But don't wait past the the final expiration of the fetch,
+	 * But don't wait past the final expiration of the fetch,
 	 * or for more than 10 seconds total.
 	 */
 	if (us > limit) {
@@ -3289,7 +3289,7 @@ add_bad(fetchctx_t *fctx, dns_message_t *rmessage, dns_adbaddrinfo_t *addrinfo,
  *
  * Since there's a good chance the server is broken and won't answer either
  * query, and since an ADB find with two pending fetches is a very rare
- * occurrance anyway, we regard this theoretical SERVFAIL as the lesser
+ * occurrence anyway, we regard this theoretical SERVFAIL as the lesser
  * evil.
  */
 static bool
@@ -4563,7 +4563,7 @@ resume_qmin(void *arg) {
 		}
 
 		/*
-		 * We have got a CNAME or DNAME respone to the NS query
+		 * We have got a CNAME or DNAME response to the NS query
 		 * so we are done in almost all cases.
 		 */
 		if ((result == DNS_R_CNAME || result == DNS_R_DNAME) &&
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index c5e3c9b8df7..079d34e3501 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -578,7 +578,7 @@ fix_qname_skip_recurse(dns_rpz_zones_t *rpzs) {
 		 * it is okay to skip recursion. After the first zone
 		 * that has to wait for recursion, all the others have
 		 * to wait as well, so we want to create a mask in which
-		 * all the trailing zeroes in zbits_req are are 1, and
+		 * all the trailing zeroes in zbits_req are 1, and
 		 * more significant bits are 0. (For instance,
 		 * 0x0700 => 0x00ff, 0x0007 => 0x0000)
 		 */
diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 91cf387f5ba..fd86ec024ff 100644
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -46,7 +46,7 @@ log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf,
 
 /*
  * Get a modulus for a hash function that is tolerably likely to be
- * relatively prime to most inputs.  Of course, we get a prime for for initial
+ * relatively prime to most inputs.  Of course, we get a prime for initial
  * values not larger than the square of the last prime.  We often get a prime
  * after that.
  * This works well in practice for hash tables up to at least 100
diff --git a/lib/dns/unreachcache.c b/lib/dns/unreachcache.c
index ced9fc680be..d24e2d8a8b6 100644
--- a/lib/dns/unreachcache.c
+++ b/lib/dns/unreachcache.c
@@ -262,7 +262,7 @@ static void
 ucentry_backoff(const dns_unreachcache_t *uc, const isc_stdtime_t now,
 		dns_ucentry_t *new, const dns_ucentry_t *old) {
 	/*
-	 * Perform exponential backoff if this is an expired entry wating to be
+	 * Perform exponential backoff if this is an expired entry waiting to be
 	 * evicted. Otherwise it's a duplicate entry and no backoff is required
 	 * as we will just update the cache with a new entry that has the same
 	 * expiration time as the old one, but calculated freshly, based on the
diff --git a/lib/isc/histo.c b/lib/isc/histo.c
index acfd3256c46..77f31002e20 100644
--- a/lib/isc/histo.c
+++ b/lib/isc/histo.c
@@ -169,7 +169,7 @@ isc_histo_digits_to_bits(uint digits) {
  * one value per bucket. There are CHUNKSIZE values before chunk 1
  * which map to chunk 0, so it also has one value per bucket. (Hence
  * the first two chunks have one value per bucket.) The values in
- * chunk 0 correspond to denormal nubers in floating point terms.
+ * chunk 0 correspond to denormal numbers in floating point terms.
  * They are also the values where `63 - sigbits - clz` would be less
  * than one if denormals were not handled specially.
  *
diff --git a/lib/isc/ht.c b/lib/isc/ht.c
index f18978cdac7..d86a1933c33 100644
--- a/lib/isc/ht.c
+++ b/lib/isc/ht.c
@@ -116,7 +116,7 @@ rehashing_in_progress(const isc_ht_t *ht) {
 }
 
 static bool
-hashtable_is_overcommited(isc_ht_t *ht) {
+hashtable_is_overcommitted(isc_ht_t *ht) {
 	return ht->count >= (ht->size[ht->hindex] * HT_OVERCOMMIT);
 }
 
@@ -313,7 +313,7 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
 	if (rehashing_in_progress(ht)) {
 		/* Rehash in progress */
 		hashtable_rehash_one(ht);
-	} else if (hashtable_is_overcommited(ht)) {
+	} else if (hashtable_is_overcommitted(ht)) {
 		/* Rehash requested */
 		maybe_rehash(ht, ht->count);
 	}
diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h
index ebe042cb74e..a89d0fc01f3 100644
--- a/lib/isc/include/isc/hex.h
+++ b/lib/isc/include/isc/hex.h
@@ -73,7 +73,7 @@ isc_hex_totext(isc_region_t *source, int wordlength, const char *wordbreak,
  * `isc_hex_decodestring()`, which can be directly used for simpler cases.
  * However, for more complex cases (or cases which, for instance, must not have
  * white spaces, or if the input is not a null-terminated string) using those
- * lower-level API might be usefull.
+ * lower-level API might be useful.
  */
 
 void
diff --git a/lib/isc/include/isc/hmac.h b/lib/isc/include/isc/hmac.h
index 06f0893f985..b8497c21f21 100644
--- a/lib/isc/include/isc/hmac.h
+++ b/lib/isc/include/isc/hmac.h
@@ -13,7 +13,7 @@
 
 /*!
  * \file isc/hmac.h
- * \brief This is the header for for message authentication code.
+ * \brief This is the header for message authentication code.
  */
 
 #pragma once
diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
index a2201543204..b3642f47c1c 100644
--- a/lib/isc/include/isc/stdio.h
+++ b/lib/isc/include/isc/stdio.h
@@ -18,7 +18,7 @@
 /*%
  * These functions are wrappers around the corresponding stdio functions.
  *
- * They return a detailed error code in the form of an an isc_result_t.  ANSI C
+ * They return a detailed error code in the form of an isc_result_t.  ANSI C
  * does not guarantee that stdio functions set errno, hence these functions
  * must use platform dependent methods (e.g., the POSIX errno) to construct the
  * error code.
diff --git a/lib/isc/include/isc/tls.h b/lib/isc/include/isc/tls.h
index 1e10a7d6492..d824da0c6bb 100644
--- a/lib/isc/include/isc/tls.h
+++ b/lib/isc/include/isc/tls.h
@@ -216,7 +216,7 @@ isc_tlsctx_enable_http2client_alpn(isc_tlsctx_t *ctx);
 void
 isc_tlsctx_enable_http2server_alpn(isc_tlsctx_t *ctx);
 /*%<
- * Enable HTTP/2 Application Layer Protocol Negotation for 'ctx'.
+ * Enable HTTP/2 Application Layer Protocol Negotiation for 'ctx'.
  *
  * Requires:
  *\li	'ctx' is not NULL.
@@ -235,7 +235,7 @@ isc_tlsctx_enable_dot_client_alpn(isc_tlsctx_t *ctx);
 void
 isc_tlsctx_enable_dot_server_alpn(isc_tlsctx_t *ctx);
 /*%<
- * Enable DoT Application Layer Protocol Negotation for 'ctx'.
+ * Enable DoT Application Layer Protocol Negotiation for 'ctx'.
  *
  * Requires:
  *\li	'ctx' is not NULL.
diff --git a/lib/isc/netmgr/http.c b/lib/isc/netmgr/http.c
index 0055311cb20..79357ff3f9d 100644
--- a/lib/isc/netmgr/http.c
+++ b/lib/isc/netmgr/http.c
@@ -1463,7 +1463,7 @@ http_send_outgoing(isc_nm_http_session_t *session, isc_nmhandle_t *httphandle,
 	if (cb != NULL) {
 		/*
 		 * Case 0: The callback is specified, that means that a DNS
-		 * message is ready. Let's flush the the buffer.
+		 * message is ready. Let's flush the buffer.
 		 */
 		total = max_total_write_size;
 	} else if (max_total_write_size >= FLUSH_HTTP_WRITE_BUFFER_AFTER) {
@@ -1475,9 +1475,9 @@ http_send_outgoing(isc_nm_http_session_t *session, isc_nmhandle_t *httphandle,
 	} else if (session->sending > 0 && total > 0) {
 		/*
 		 * Case 2: There is one or more write requests in flight and
-		 * we have some new data form nghttp2 to send.
+		 * we have some new data from nghttp2 to send.
 		 * Then let's return from the function: as soon as the
-		 * "in-flight" write callback get's called or we have reached
+		 * "in-flight" write callback gets called or we have reached
 		 * FLUSH_HTTP_WRITE_BUFFER_AFTER bytes in the write buffer, we
 		 * will flush the buffer. */
 		INSIST(cb == NULL);
diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
index 7a3a357fe7f..9d50d98e1a4 100644
--- a/lib/isc/netmgr/tcp.c
+++ b/lib/isc/netmgr/tcp.c
@@ -919,7 +919,7 @@ accept_connection(isc_nmsocket_t *csock) {
 
 	/*
 	 * We need to initialize the tcp and timer before failing because
-	 * isc__nm_tcp_close() can't handle uninitalized TCP nmsocket.
+	 * isc__nm_tcp_close() can't handle uninitialized TCP nmsocket.
 	 */
 	if (isc__nmsocket_closing(csock)) {
 		CLEANUP(ISC_R_CANCELED);
diff --git a/lib/isc/picohttpparser.c b/lib/isc/picohttpparser.c
index 933137714bc..89fb8b6aa3b 100644
--- a/lib/isc/picohttpparser.c
+++ b/lib/isc/picohttpparser.c
@@ -646,7 +646,7 @@ phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf,
 			}
 			decoder->_hex_count = 0;
 			decoder->_state = CHUNKED_IN_CHUNK_EXT;
-		/* fallthru */
+		/* fall through */
 		case CHUNKED_IN_CHUNK_EXT:
 			/* RFC 7230 A.2 "Line folding in chunk extensions is
 			 * disallowed" */
@@ -669,7 +669,7 @@ phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf,
 				}
 			}
 			decoder->_state = CHUNKED_IN_CHUNK_DATA;
-		/* fallthru */
+		/* fall through */
 		case CHUNKED_IN_CHUNK_DATA: {
 			size_t avail = bufsz - src;
 			if (avail < decoder->bytes_left_in_chunk) {
@@ -690,7 +690,7 @@ phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf,
 			decoder->bytes_left_in_chunk = 0;
 			decoder->_state = CHUNKED_IN_CHUNK_CRLF;
 		}
-		/* fallthru */
+		/* fall through */
 		case CHUNKED_IN_CHUNK_CRLF:
 			for (;; ++src) {
 				if (src == bufsz) {
@@ -720,7 +720,7 @@ phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf,
 				goto Complete;
 			}
 			decoder->_state = CHUNKED_IN_TRAILERS_LINE_MIDDLE;
-		/* fallthru */
+		/* fall through */
 		case CHUNKED_IN_TRAILERS_LINE_MIDDLE:
 			for (;; ++src) {
 				if (src == bufsz) {
diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index be410d77097..35432b116e1 100644
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -2223,8 +2223,8 @@ done:
 #endif /* HAVE_LIBNGHTTP2 */
 
 static isc_result_t
-check_tls_defintion(const cfg_obj_t *tlsobj, const char *name,
-		    isc_symtab_t *symtab) {
+check_tls_definition(const cfg_obj_t *tlsobj, const char *name,
+		     isc_symtab_t *symtab) {
 	isc_result_t result = ISC_R_SUCCESS, tresult;
 	const cfg_obj_t *tls_proto_list = NULL, *tls_key = NULL,
 			*tls_cert = NULL, *tls_ciphers = NULL,
@@ -2372,7 +2372,7 @@ check_tls_definitions(const cfg_obj_t *config, isc_mem_t *mctx) {
 		const char *name;
 		obj = cfg_listelt_value(elt);
 		name = cfg_obj_asstring(cfg_map_getname(obj));
-		tresult = check_tls_defintion(obj, name, symtab);
+		tresult = check_tls_definition(obj, name, symtab);
 		if (result == ISC_R_SUCCESS) {
 			result = tresult;
 		}
diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index 6ce2a5b7617..a06ee3fc0a7 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -47,7 +47,7 @@ cfg_acl_fromconfig(const cfg_obj_t *caml, const cfg_obj_t *cctx,
  * Construct a new dns_acl_t from configuration data in 'caml' and
  * 'cctx'.  Memory is allocated through 'mctx'.
  *
- * Any named ACLs referred to within 'caml' will be be converted
+ * Any named ACLs referred to within 'caml' will be converted
  * into nested dns_acl_t objects.  Multiple references to the same
  * named ACLs will be converted into shared references to a single
  * nested dns_acl_t object when the referring objects were created