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=e7aab7f7d14833fcdbf6a2072d524e55eae26930;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
(cherry picked from commit 36fe37f6b4c1d7948ec128eee0cd60ccd30b1037)
---

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index d690cbabdb5..930458db54c 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -66,7 +66,7 @@
 const char *program = "dnssec-keygen";
 
 /*
- * 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 d0493074d6e..a9907ccd397 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -2882,7 +2882,7 @@ findkeys:
 	dns_diff_init(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, mctx, report);
diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 4187e53252f..8736617f3ef 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -706,7 +706,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/dns64.c b/lib/dns/dns64.c
index 81cc87fdd61..d080a498b3c 100644
--- a/lib/dns/dns64.c
+++ b/lib/dns/dns64.c
@@ -325,7 +325,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 cf95f53622c..31bab67af21 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -622,7 +622,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.
@@ -674,7 +674,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 846c611a96e..092444d3911 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 8fbe2928b06..b665654b8a6 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -54,7 +54,7 @@ ISC_LANG_BEGINDECLS
  */
 
 /*
- * 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 f2af1756c50..b7946520458 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -691,7 +691,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:
  *
@@ -708,7 +708,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 3a9845e35fc..d0445f3cf25 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -197,7 +197,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 9fec23041b1..b36a885abb9 100644
--- a/lib/dns/include/dns/nametree.h
+++ b/lib/dns/include/dns/nametree.h
@@ -83,10 +83,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 d72730c80ac..4bfb61be25f 100644
--- a/lib/dns/include/dns/qp.h
+++ b/lib/dns/include/dns/qp.h
@@ -328,7 +328,7 @@ typedef enum dns_qpgc {
 
 /***********************************************************************
  *
- *  functions - create, destory, enquire
+ *  functions - create, destroy, enquire
  */
 
 void
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 2ba66e7ed5b..1fb82a03e64 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -153,7 +153,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
@@ -338,7 +338,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 ead00976323..b94d6992e81 100644
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -155,7 +155,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 0ce5046bebf..63383db4664 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -128,7 +128,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 e5d99e4d3f7..e1fcfe0c4bc 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1750,7 +1750,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/name.c b/lib/dns/name.c
index aede7da585e..1a900fb5bca 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1415,7 +1415,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 d4dbb60c10d..6c811e61216 100644
--- a/lib/dns/qp.c
+++ b/lib/dns/qp.c
@@ -140,7 +140,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 666d6fb9ed8..f8bbd2ff82f 100644
--- a/lib/dns/qp_p.h
+++ b/lib/dns/qp_p.h
@@ -51,7 +51,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
@@ -819,7 +819,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 1969d2116f5..64a970df714 100644
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -180,7 +180,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 1b6958715f9..1f3d4227322 100644
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -175,7 +175,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
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 188d54604af..f443bdf354f 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 9af4cc3db84..1f4ac35826d 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1926,7 +1926,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) {
@@ -3181,7 +3181,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
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 5fea09877de..335dd37e0b1 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 7ff79f87c7d..4d27850bccf 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/isc/histo.c b/lib/isc/histo.c
index 4fa9d833963..044303862e9 100644
--- a/lib/isc/histo.c
+++ b/lib/isc/histo.c
@@ -167,7 +167,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/hmac.h b/lib/isc/include/isc/hmac.h
index 68b63d478a9..2ac889531ef 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 c8bac4d2514..b0a49866b77 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 23b92c72d11..4be7f3b4e30 100644
--- a/lib/isc/include/isc/tls.h
+++ b/lib/isc/include/isc/tls.h
@@ -215,7 +215,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.
@@ -234,7 +234,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 82742df510d..5b67a8cbf0a 100644
--- a/lib/isc/netmgr/http.c
+++ b/lib/isc/netmgr/http.c
@@ -1468,7 +1468,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) {
@@ -1480,9 +1480,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 7d70d546239..c582740f94a 100644
--- a/lib/isc/netmgr/tcp.c
+++ b/lib/isc/netmgr/tcp.c
@@ -903,7 +903,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)) {
 		result = 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 e3e27590d06..07b77a49380 100644
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -2360,8 +2360,8 @@ done:
 #endif /* HAVE_LIBNGHTTP2 */
 
 static isc_result_t
-check_tls_defintion(const cfg_obj_t *tlsobj, const char *name,
-		    isc_log_t *logctx, isc_symtab_t *symtab) {
+check_tls_definition(const cfg_obj_t *tlsobj, const char *name,
+		     isc_log_t *logctx, isc_symtab_t *symtab) {
 	isc_result_t result, tresult;
 	const cfg_obj_t *tls_proto_list = NULL, *tls_key = NULL,
 			*tls_cert = NULL, *tls_ciphers = NULL,
@@ -2520,7 +2520,7 @@ check_tls_definitions(const cfg_obj_t *config, isc_log_t *logctx,
 		const char *name;
 		obj = cfg_listelt_value(elt);
 		name = cfg_obj_asstring(cfg_map_getname(obj));
-		tresult = check_tls_defintion(obj, name, logctx, symtab);
+		tresult = check_tls_definition(obj, name, logctx, 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 3d70f922e7d..bca8fed5c66 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -64,7 +64,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