From 991addc6a9aba9190716482aeb73825b07e2f089 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 23:16:17 -0500
Subject: [PATCH 01/35] spelling: access

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-auth/auth-scram-server.c | 2 +-
 src/lib-auth/auth-scram-server.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-auth/auth-scram-server.c b/src/lib-auth/auth-scram-server.c
index b6b4062c8c6..70538097691 100644
--- a/src/lib-auth/auth-scram-server.c
+++ b/src/lib-auth/auth-scram-server.c
@@ -542,7 +542,7 @@ auth_scram_parse_client_finish(struct auth_scram_server *server ATTR_UNUSED,
 	return 0;
 }
 
-bool auth_scram_server_acces_granted(struct auth_scram_server *server)
+bool auth_scram_server_access_granted(struct auth_scram_server *server)
 {
 	return (server->state == AUTH_SCRAM_SERVER_STATE_SERVER_FINAL);
 }
diff --git a/src/lib-auth/auth-scram-server.h b/src/lib-auth/auth-scram-server.h
index 7c54f98d72c..cd5df3e8886 100644
--- a/src/lib-auth/auth-scram-server.h
+++ b/src/lib-auth/auth-scram-server.h
@@ -96,7 +96,7 @@ void auth_scram_server_init(struct auth_scram_server *server_r, pool_t pool,
 void auth_scram_server_deinit(struct auth_scram_server *server);
 
 /* Returns TRUE if authentication was concluded successfully. */
-bool auth_scram_server_acces_granted(struct auth_scram_server *server);
+bool auth_scram_server_access_granted(struct auth_scram_server *server);
 
 /* Pass client input to the server. Returns 1 if server output is available, 0
    if no server output is available yet (e.g. pending credentials lookup), and

From c8afd40a093516c75a24e7f2cf8f29194335b149 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:14:20 -0500
Subject: [PATCH 02/35] spelling: accidentally

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 m4/dovecot.m4                  | 2 +-
 src/lib-mail/message-decoder.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index cc4f8d4ae60..023a96924f8 100644
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -361,7 +361,7 @@ AC_DEFUN([DC_DOVECOT],[
 	cd $old
 	DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
 
-	dnl Make sure dovecot-config doesn't accidentically override flags
+	dnl Make sure dovecot-config doesn't accidentally override flags
 	ORIG_CFLAGS="$CFLAGS"
 	ORIG_LDFLAGS="$LDFLAGS"
 	ORIG_BINARY_CFLAGS="$BINARY_CFLAGS"
diff --git a/src/lib-mail/message-decoder.c b/src/lib-mail/message-decoder.c
index 845b3d5e3ae..39e35d82c2a 100644
--- a/src/lib-mail/message-decoder.c
+++ b/src/lib-mail/message-decoder.c
@@ -94,7 +94,7 @@ enum message_cte message_decoder_parse_cte(const struct message_header_line *hdr
 
 	rfc822_skip_lwsp(&parser);
 
-	/* Ensure we do not accidentically accept confused values like
+	/* Ensure we do not accidentally accept confused values like
 	   'base64 binary' or embedded NULs */
 	if (rfc822_parse_mime_token(&parser, value) == 1) {
 		rfc822_skip_lwsp(&parser);

From eb8365ac918aea5261b6ae509ac740e1b4905007 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:15:00 -0500
Subject: [PATCH 03/35] spelling: address

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-smtp/test-smtp-address.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-smtp/test-smtp-address.c b/src/lib-smtp/test-smtp-address.c
index 857c03a56ca..c0bc7140b5d 100644
--- a/src/lib-smtp/test-smtp-address.c
+++ b/src/lib-smtp/test-smtp-address.c
@@ -1163,7 +1163,7 @@ address_detail_parse_tests[] = {
 	  "address:another+delim", '-' },
 };
 
-unsigned int addresss_detail_parse_test_count =
+unsigned int address_detail_parse_test_count =
 	N_ELEMENTS(address_detail_parse_tests);
 
 static void test_smtp_address_detail_parse(void)
@@ -1171,7 +1171,7 @@ static void test_smtp_address_detail_parse(void)
 	unsigned int i;
 
 
-	for (i = 0; i < N_ELEMENTS(address_detail_parse_tests); i++) T_BEGIN {
+	for (i = 0; i < address_detail_parse_test_count; i++) T_BEGIN {
 		const struct address_detail_parse_test *test =
 			&address_detail_parse_tests[i];
 		struct smtp_address *address;

From 258a877e494f123b03c53ff5d74d9bf003b1c2ea Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:05:45 -0500
Subject: [PATCH 04/35] spelling: after

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/doveadm/test-doveadm-cmd-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doveadm/test-doveadm-cmd-parse.c b/src/doveadm/test-doveadm-cmd-parse.c
index 7b4869c4d19..d2429a74fd2 100644
--- a/src/doveadm/test-doveadm-cmd-parse.c
+++ b/src/doveadm/test-doveadm-cmd-parse.c
@@ -268,7 +268,7 @@ static void test_switches(void)
 		line("cmd -2 value2 -1 arg1"));
 	test_case("kwswitch_after_12", 0, assert_switch12_1_pos_args, &cmdv2_switches,
 		line("cmd arg1 -1 -2 value2"));
-	test_case("kwswitch_fater_21", 0, assert_switch12_1_pos_args, &cmdv2_switches,
+	test_case("kwswitch_after_21", 0, assert_switch12_1_pos_args, &cmdv2_switches,
 		line("cmd arg1 -2 value2 -1"));
 }
 

From dfd3dbff33ed045ddaf95d2e140963098538c88c Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:20:16 -0500
Subject: [PATCH 05/35] spelling: backoff

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-http/http-client-peer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-http/http-client-peer.c b/src/lib-http/http-client-peer.c
index e6a95c9a144..74117b58cbd 100644
--- a/src/lib-http/http-client-peer.c
+++ b/src/lib-http/http-client-peer.c
@@ -739,7 +739,7 @@ static void http_client_peer_drop(struct http_client_peer **_peer)
 
 	if (http_client_peer_shared_start_backoff_timer(pshared)) {
 		e_debug(peer->event,
-			"Dropping peer (waiting for backof timeout)");
+			"Dropping peer (waiting for backoff timeout)");
 
 		/* Will disconnect any pending connections */
 		http_client_peer_trigger_request_handler(peer);

From 6cf25421de4f32999d9bdcb43336fd72a782fe92 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:20:54 -0500
Subject: [PATCH 06/35] spelling: banana

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/stats/test-stats-metrics.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stats/test-stats-metrics.c b/src/stats/test-stats-metrics.c
index 8208b5b3fd6..3dc0ac544e5 100644
--- a/src/stats/test-stats-metrics.c
+++ b/src/stats/test-stats-metrics.c
@@ -160,7 +160,7 @@ static const struct discrete_test discrete_tests[] = {
 		  "metric/test/group_by/sub_name/method/discrete/method=discrete",
 		  NULL },
 		3,
-		{ "apple", "bannana", "orange", },
+		{ "apple", "banana", "orange", },
 		{ "pie", "yoghurt", "cobbler", },
 	},
 	{

From 82b26a863d295c0d812581b1359aa21cbb1d8965 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:27:25 -0500
Subject: [PATCH 07/35] spelling: builtin

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-var-expand/test-var-expand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-var-expand/test-var-expand.c b/src/lib-var-expand/test-var-expand.c
index 3f3327f1b34..8e7e2ecc1fa 100644
--- a/src/lib-var-expand/test-var-expand.c
+++ b/src/lib-var-expand/test-var-expand.c
@@ -74,7 +74,7 @@ static void run_var_expand_tests(const struct var_expand_params *params,
 }
 
 static void test_var_expand_builtin_filters(void) {
-	test_begin("var_expand(buildin filters)");
+	test_begin("var_expand(builtin filters)");
 
 	const struct var_expand_table table[] = {
 		{ .key = "first", .value = "hello", },

From 17396e8e8c02102e454b163418a82cfcbf7cfbaa Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:54:44 -0500
Subject: [PATCH 08/35] spelling: cannot

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-language/lang-tokenizer-generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-language/lang-tokenizer-generic.c b/src/lib-language/lang-tokenizer-generic.c
index 736d72a8bd5..bf3d72296ca 100644
--- a/src/lib-language/lang-tokenizer-generic.c
+++ b/src/lib-language/lang-tokenizer-generic.c
@@ -68,7 +68,7 @@ lang_tokenizer_generic_create(const struct lang_settings *set,
 
 	bool wb5a = set->tokenizer_generic_wb5a;
 	if (wb5a && algo->id != BOUNDARY_ALGORITHM_TR29) {
-		*error_r = "Can not use language_tokenizer_generic_wb5a for "
+		*error_r = "Cannot use language_tokenizer_generic_wb5a for "
 			   "algorithms other than language_tokenizer_generic_algorithm = tr29";
 		return -1;
 	}

From 6d1ccb49b46981e7faade91b32c366affbea267b Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:55:17 -0500
Subject: [PATCH 09/35] spelling: case-sensitive

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-storage/mailbox-list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 9712d1d6799..6ccc7b10ab8 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -276,7 +276,7 @@ mailbox_list_vname_prepare(struct mailbox_list *list, const char **_vname)
 
 	if (strcasecmp(vname, "INBOX") == 0 &&
 	    (list->ns->flags & NAMESPACE_FLAG_INBOX_USER) != 0) {
-		/* INBOX is case sensitive. Normalize it into "INBOX". */
+		/* INBOX is case-sensitive. Normalize it into "INBOX". */
 		vname = "INBOX";
 	} else if (ns->prefix_len > 0) {
 		/* skip namespace prefix, except if this is INBOX */

From 61d2aa4f56c841b32d0b4eff78f9b1f0476976ea Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:33:49 -0500
Subject: [PATCH 10/35] spelling: client

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-dns-client/dns-lua.h       | 2 +-
 src/lib-smtp/smtp-client-command.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib-dns-client/dns-lua.h b/src/lib-dns-client/dns-lua.h
index 80259ce668d..68ee444157f 100644
--- a/src/lib-dns-client/dns-lua.h
+++ b/src/lib-dns-client/dns-lua.h
@@ -7,7 +7,7 @@ struct dns_client;
 /* Internally, the dns methods yield via lua_yieldk() as implemented in Lua
    5.3 and newer. */
 
-void dlua_push_dns_client(lua_State *L, struct dns_client *cliet);
+void dlua_push_dns_client(lua_State *L, struct dns_client *client);
 struct dns_client *dlua_check_dns_client(lua_State *L, int idx);
 
 #endif
diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c
index ddeaa580570..0652da174d3 100644
--- a/src/lib-smtp/smtp-client-command.c
+++ b/src/lib-smtp/smtp-client-command.c
@@ -701,7 +701,7 @@ smtp_client_command_pipeline_is_open(struct smtp_client_connection *conn)
 	return TRUE;
 }
 
-static void smtp_cient_command_wait(struct smtp_client_command *cmd)
+static void smtp_client_command_wait(struct smtp_client_command *cmd)
 {
 	struct smtp_client_connection *conn = cmd->conn;
 
@@ -740,7 +740,7 @@ static int smtp_client_command_do_send_more(struct smtp_client_connection *conn)
 			return ret;
 
 		/* Command line sent. move command to wait list. */
-		smtp_cient_command_wait(cmd);
+		smtp_client_command_wait(cmd);
 		cmd->state = SMTP_CLIENT_COMMAND_STATE_WAITING;
 	}
 

From fbfa4142a1f6f233a14e668d26f37c62a84e0743 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:37:22 -0500
Subject: [PATCH 11/35] spelling: committed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-index/mail-cache-transaction.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c
index 7d3f30fa894..b0e379ac8ed 100644
--- a/src/lib-index/mail-cache-transaction.c
+++ b/src/lib-index/mail-cache-transaction.c
@@ -48,7 +48,7 @@ struct mail_cache_transaction_ctx {
 
 	bool tried_purging:1;
 	bool decisions_refreshed:1;
-	bool have_noncommited_mails:1;
+	bool have_noncommitted_mails:1;
 	bool changes:1;
 };
 
@@ -304,7 +304,7 @@ mail_cache_transaction_update_index(struct mail_cache_transaction_ctx *ctx,
 	if (committing) {
 		/* The transaction is being committed now. Use it. */
 		trans = ctx->trans;
-	} else if (ctx->have_noncommited_mails) {
+	} else if (ctx->have_noncommitted_mails) {
 		/* Some of the mails haven't been committed yet. We must use
 		   the provided transaction to update the cache records. */
 		trans = ctx->trans;
@@ -518,7 +518,7 @@ mail_cache_transaction_flush(struct mail_cache_transaction_ctx *ctx,
 	/* If we're going to be committing a transaction, the log must be
 	   locked before we lock cache or we can deadlock. */
 	bool lock_log = !ctx->cache->index->log_sync_locked &&
-		!committing && !ctx->have_noncommited_mails;
+		!committing && !ctx->have_noncommitted_mails;
 	if (lock_log) {
 		uint32_t file_seq;
 		uoff_t file_offset;
@@ -788,7 +788,7 @@ void mail_cache_add(struct mail_cache_transaction_ctx *ctx, uint32_t seq,
 		return;
 
 	if (seq >= ctx->trans->first_new_seq)
-		ctx->have_noncommited_mails = TRUE;
+		ctx->have_noncommitted_mails = TRUE;
 
 	/* If the cache file exists, make sure the caching decisions have been
 	   read. */

From 74adeb0d66c0ba1a0b1dcb5b6dd36d794bf7ae41 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:37:31 -0500
Subject: [PATCH 12/35] spelling: concatenated

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-compression/istream-zlib.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c
index f5513747244..5d233322275 100644
--- a/src/lib-compression/istream-zlib.c
+++ b/src/lib-compression/istream-zlib.c
@@ -32,7 +32,7 @@ struct zlib_istream {
 	bool header_read:1;
 	bool trailer_read:1;
 	bool zs_closed:1;
-	bool starting_concated_output:1;
+	bool starting_concatenated_output:1;
 };
 
 static void i_stream_zlib_init(struct zlib_istream *zstream);
@@ -191,9 +191,9 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream)
 			return -1;
 		}
 		/* Multiple gz streams concatenated together */
-		zstream->starting_concated_output = TRUE;
+		zstream->starting_concatenated_output = TRUE;
 	}
-	if (zstream->starting_concated_output) {
+	if (zstream->starting_concatenated_output) {
 		/* make sure there actually is something in parent stream.
 		   we don't want to reset the stream unless we actually see
 		   some concatenated output. */
@@ -215,7 +215,7 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream)
 		zstream->header_read = FALSE;
 		zstream->trailer_read = FALSE;
 		zstream->crc32 = 0;
-		zstream->starting_concated_output = FALSE;
+		zstream->starting_concatenated_output = FALSE;
 
 		(void)inflateEnd(&zstream->zs);
 		i_stream_zlib_init(zstream);

From a7f6bee4e7254334f97ce75f675828b70d6fb372 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:38:03 -0500
Subject: [PATCH 13/35] spelling: connection

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-smtp/smtp-client-transaction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c
index 0112021f3c6..849f97961ec 100644
--- a/src/lib-smtp/smtp-client-transaction.c
+++ b/src/lib-smtp/smtp-client-transaction.c
@@ -968,7 +968,7 @@ smtp_client_transaction_connection_ready(struct smtp_client_transaction *trans)
 	if (trans->state != SMTP_CLIENT_TRANSACTION_STATE_PENDING)
 		return;
 
-	e_debug(trans->event, "Connecton is ready for transaction");
+	e_debug(trans->event, "Connection is ready for transaction");
 
 	trans->state = SMTP_CLIENT_TRANSACTION_STATE_MAIL_FROM;
 

From 6715a73fb715b7d276c911f3c63f604dfb1e1ef1 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:38:59 -0500
Subject: [PATCH 14/35] spelling: couldn't

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-lua/dlua-dovecot-http.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-lua/dlua-dovecot-http.c b/src/lib-lua/dlua-dovecot-http.c
index fe793f7ef1f..654d39ed205 100644
--- a/src/lib-lua/dlua-dovecot-http.c
+++ b/src/lib-lua/dlua-dovecot-http.c
@@ -116,7 +116,7 @@ static int dlua_http_request_submit(lua_State *L)
 	   submitted. */
 	lua_getfield(L, -1, "item");
 	if (lua_getmetatable(L, -1) != 1)
-		return luaL_error(L, "Cound't get metatable for the request");
+		return luaL_error(L, "Couldn't get metatable for the request");
 	lua_pushnil(L);
 	lua_setfield(L, -2, "__gc");
 	lua_pop(L, 2);

From 8d95556b3c05cda9c7d769dd2a260b30386a96d3 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 Feb 2025 22:22:42 -0500
Subject: [PATCH 15/35] spelling: digest

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-dcrypt/dcrypt-openssl1.c | 12 ++++++------
 src/lib-dcrypt/dcrypt-openssl3.c | 12 ++++++------
 src/lib-dcrypt/istream-decrypt.c | 20 ++++++++++----------
 src/lib-dcrypt/test-stream.c     | 22 +++++++++++-----------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/lib-dcrypt/dcrypt-openssl1.c b/src/lib-dcrypt/dcrypt-openssl1.c
index f4d97453a5b..3c02afe1593 100644
--- a/src/lib-dcrypt/dcrypt-openssl1.c
+++ b/src/lib-dcrypt/dcrypt-openssl1.c
@@ -2565,15 +2565,15 @@ dcrypt_openssl_load_public_key_dovecot_v1(struct dcrypt_public_key **key_r,
 		EVP_PKEY_set1_EC_KEY(key, eckey);
 		EC_KEY_free(eckey);
 		/* make sure digest matches */
-		buffer_t *dgst = t_buffer_create(32);
+		buffer_t *digest = t_buffer_create(32);
 		struct dcrypt_public_key tmp;
 		i_zero(&tmp);
 		tmp.key = key;
-		if (!dcrypt_openssl_public_key_id_old(&tmp, dgst, error_r)) {
+		if (!dcrypt_openssl_public_key_id_old(&tmp, digest, error_r)) {
 			EVP_PKEY_free(key);
 			return FALSE;
 		}
-		if (strcmp(binary_to_hex(dgst->data, dgst->used),
+		if (strcmp(binary_to_hex(digest->data, digest->used),
 			   input[len-1]) != 0) {
 			*error_r = "Key id mismatch after load";
 			EVP_PKEY_free(key);
@@ -2610,15 +2610,15 @@ dcrypt_openssl_load_public_key_dovecot_v2(struct dcrypt_public_key **key_r,
 	}
 
 	/* make sure digest matches */
-	buffer_t *dgst = t_buffer_create(32);
+	buffer_t *digest = t_buffer_create(32);
 	struct dcrypt_public_key tmpkey;
 	i_zero(&tmpkey);
 	tmpkey.key = pkey;
-	if (!dcrypt_openssl_public_key_id(&tmpkey, "sha256", dgst, error_r)) {
+	if (!dcrypt_openssl_public_key_id(&tmpkey, "sha256", digest, error_r)) {
 		EVP_PKEY_free(pkey);
 		return FALSE;
 	}
-	if (strcmp(binary_to_hex(dgst->data, dgst->used), input[len-1]) != 0) {
+	if (strcmp(binary_to_hex(digest->data, digest->used), input[len-1]) != 0) {
 		*error_r = "Key id mismatch after load";
 		EVP_PKEY_free(pkey);
 		return FALSE;
diff --git a/src/lib-dcrypt/dcrypt-openssl3.c b/src/lib-dcrypt/dcrypt-openssl3.c
index ac8401838c2..2928c2abc51 100644
--- a/src/lib-dcrypt/dcrypt-openssl3.c
+++ b/src/lib-dcrypt/dcrypt-openssl3.c
@@ -2585,16 +2585,16 @@ dcrypt_openssl_load_public_key_dovecot_v1(struct dcrypt_public_key **key_r,
 	EC_GROUP_free(g);
 	i_assert(pkey != NULL);
 	/* make sure digest matches */
-	buffer_t *dgst = t_buffer_create(32);
+	buffer_t *digest = t_buffer_create(32);
 	struct dcrypt_public_key tmp;
 	i_zero(&tmp);
 	tmp.key = pkey;
-	if (!dcrypt_openssl_public_key_id_old(&tmp, dgst, error_r)) {
+	if (!dcrypt_openssl_public_key_id_old(&tmp, digest, error_r)) {
 		EVP_PKEY_free(pkey);
 		return FALSE;
 	}
 
-	if (strcmp(binary_to_hex(dgst->data, dgst->used),
+	if (strcmp(binary_to_hex(digest->data, digest->used),
 		   input[len-1]) != 0) {
 		*error_r = "Key id mismatch after load";
 		EVP_PKEY_free(pkey);
@@ -2626,15 +2626,15 @@ dcrypt_openssl_load_public_key_dovecot_v2(struct dcrypt_public_key **key_r,
 	}
 
 	/* make sure digest matches */
-	buffer_t *dgst = t_buffer_create(32);
+	buffer_t *digest = t_buffer_create(32);
 	struct dcrypt_public_key tmpkey = {
 		.key = pkey
 	};
-	if (!dcrypt_openssl_public_key_id(&tmpkey, "sha256", dgst, error_r)) {
+	if (!dcrypt_openssl_public_key_id(&tmpkey, "sha256", digest, error_r)) {
 		EVP_PKEY_free(pkey);
 		return FALSE;
 	}
-	if (strcmp(binary_to_hex(dgst->data, dgst->used), input[len-1]) != 0) {
+	if (strcmp(binary_to_hex(digest->data, digest->used), input[len-1]) != 0) {
 		*error_r = "Key id mismatch after load";
 		EVP_PKEY_free(pkey);
 		return FALSE;
diff --git a/src/lib-dcrypt/istream-decrypt.c b/src/lib-dcrypt/istream-decrypt.c
index ab1ee7a18fa..11daa277d6e 100644
--- a/src/lib-dcrypt/istream-decrypt.c
+++ b/src/lib-dcrypt/istream-decrypt.c
@@ -335,7 +335,7 @@ i_stream_decrypt_key(struct decrypt_istream *stream, const char *malg,
 	enum dcrypt_key_type ktype;
 	int keys;
 	bool have_key = FALSE;
-	unsigned char dgst[32];
+	unsigned char digest[32];
 	uint32_t val;
 	buffer_t buf;
 
@@ -346,7 +346,7 @@ i_stream_decrypt_key(struct decrypt_istream *stream, const char *malg,
 
 	/* if we have a key, prefab the digest */
 	if (stream->priv_key != NULL) {
-		buffer_create_from_data(&buf, dgst, sizeof(dgst));
+		buffer_create_from_data(&buf, digest, sizeof(digest));
 		if (!dcrypt_key_id_private(stream->priv_key, "sha256", &buf,
 					   &error)) {
 			io_stream_set_error(&stream->istream.iostream,
@@ -364,19 +364,19 @@ i_stream_decrypt_key(struct decrypt_istream *stream, const char *malg,
 
 	/* for each key */
 	for(;keys>0;keys--) {
-		if ((size_t)(end-data) < 1 + (ssize_t)sizeof(dgst))
+		if ((size_t)(end-data) < 1 + (ssize_t)sizeof(digest))
 			return 0;
 		ktype = *data++;
 
 		if (stream->priv_key != NULL) {
 			/* see if key matches to the one we have */
-			if (memcmp(dgst, data, sizeof(dgst)) == 0) {
+			if (memcmp(digest, data, sizeof(digest)) == 0) {
 				have_key = TRUE;
 				break;
 			}
 		} else if (stream->key_callback != NULL) {
 			const char *hexdgst = /* digest length */
-				binary_to_hex(data, sizeof(dgst));
+				binary_to_hex(data, sizeof(digest));
 			if (stream->priv_key != NULL)
 				dcrypt_key_unref_private(&stream->priv_key);
 			/* hope you going to give us right key.. */
@@ -393,7 +393,7 @@ i_stream_decrypt_key(struct decrypt_istream *stream, const char *malg,
 				break;
 			}
 		}
-		data += sizeof(dgst);
+		data += sizeof(digest);
 
 		/* wasn't correct key, skip over some data */
 		if (!get_msb32(&data, end, &val) ||
@@ -409,7 +409,7 @@ i_stream_decrypt_key(struct decrypt_istream *stream, const char *malg,
 		return -1;
 	}
 
-	data += sizeof(dgst);
+	data += sizeof(digest);
 
 	const unsigned char *ephemeral_key;
 	uint32_t ep_key_len;
@@ -965,16 +965,16 @@ i_stream_decrypt_read(struct istream_private *stream)
 			if ((dstream->flags & IO_STREAM_ENC_INTEGRITY_HMAC) ==
 				IO_STREAM_ENC_INTEGRITY_HMAC) {
 				size_t maclen = dcrypt_ctx_hmac_get_digest_length(dstream->ctx_mac);
-				unsigned char dgst[maclen];
+				unsigned char digest[maclen];
 				buffer_t db;
-				buffer_create_from_data(&db, dgst, sizeof(dgst));
+				buffer_create_from_data(&db, digest, sizeof(digest));
 				if (!dcrypt_ctx_hmac_final(dstream->ctx_mac, &db, &error)) {
 					io_stream_set_error(&stream->iostream,
 						"Cannot verify MAC: %s", error);
 					stream->istream.stream_errno = EIO;
 					return -1;
 				}
-				if (memcmp(dgst, data + decrypt_size, maclen) != 0) {
+				if (memcmp(digest, data + decrypt_size, maclen) != 0) {
 					io_stream_set_error(&stream->iostream,
 						"Cannot verify MAC: mismatch");
 					stream->istream.stream_errno = EIO;
diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index 6d13c62df79..c73f64083d6 100644
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -76,7 +76,7 @@ static void test_static_v1_input(void)
 	ssize_t siz;
 	const struct hash_method *hash = hash_method_lookup("sha256");
 	unsigned char hash_ctx[hash->context_size];
-	unsigned char hash_dgst[hash->digest_size];
+	unsigned char hash_digest[hash->digest_size];
 	hash->init(hash_ctx);
 
 	test_begin("test_static_v1_input");
@@ -100,10 +100,10 @@ static void test_static_v1_input(void)
 
 	i_stream_unref(&is_4);
 
-	hash->result(hash_ctx, hash_dgst);
+	hash->result(hash_ctx, hash_digest);
 
 	test_assert(strcmp(test_sample_v1_hash,
-			   binary_to_hex(hash_dgst, sizeof(hash_dgst))) == 0);
+			   binary_to_hex(hash_digest, sizeof(hash_digest))) == 0);
 
 	test_end();
 }
@@ -113,7 +113,7 @@ static void test_static_v1_input_short(void)
 	ssize_t siz;
 	const struct hash_method *hash = hash_method_lookup("sha256");
 	unsigned char hash_ctx[hash->context_size];
-	unsigned char hash_dgst[hash->digest_size];
+	unsigned char hash_digest[hash->digest_size];
 	hash->init(hash_ctx);
 
 	test_begin("test_static_v1_input_short");
@@ -137,10 +137,10 @@ static void test_static_v1_input_short(void)
 
 	i_stream_unref(&is_4);
 
-	hash->result(hash_ctx, hash_dgst);
+	hash->result(hash_ctx, hash_digest);
 
 	test_assert(strcmp(test_sample_v1_short_hash,
-			   binary_to_hex(hash_dgst, sizeof(hash_dgst))) == 0);
+			   binary_to_hex(hash_digest, sizeof(hash_digest))) == 0);
 
 	test_end();
 }
@@ -152,7 +152,7 @@ static void test_static_v2_input(void)
 	ssize_t amt;
 	const struct hash_method *hash = hash_method_lookup("sha256");
 	unsigned char hash_ctx[hash->context_size];
-	unsigned char hash_dgst[hash->digest_size];
+	unsigned char hash_digest[hash->digest_size];
 	hash->init(hash_ctx);
 
 	struct istream *is_1 =
@@ -174,10 +174,10 @@ static void test_static_v2_input(void)
 
 	i_stream_unref(&is_4);
 
-	hash->result(hash_ctx, hash_dgst);
+	hash->result(hash_ctx, hash_digest);
 
 	test_assert(strcmp(test_sample_v2_hash,
-		    binary_to_hex(hash_dgst, sizeof(hash_dgst))) == 0);
+		    binary_to_hex(hash_digest, sizeof(hash_digest))) == 0);
 
 	test_end();
 
@@ -203,8 +203,8 @@ static void test_static_v2_input(void)
 	o_stream_close(os_2);
 	i_stream_close(is_2);
 
-	hash->result(hash_ctx, hash_dgst);
-	printf("%s\n", binary_to_hex(hash_dgst, sizeof(hash_dgst)));
+	hash->result(hash_ctx, hash_digest);
+	printf("%s\n", binary_to_hex(hash_digest, sizeof(hash_digest)));
 */
 }
 

From 23b57c4b0981f4759b59d1f0ddad0e2b61315852 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 Feb 2025 21:55:33 -0500
Subject: [PATCH 16/35] spelling: dsasl

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-sasl/dsasl-client-private.h | 6 +++---
 src/lib-sasl/mech-scram.c           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib-sasl/dsasl-client-private.h b/src/lib-sasl/dsasl-client-private.h
index 8a0cd4f6cb4..f4152d62eb5 100644
--- a/src/lib-sasl/dsasl-client-private.h
+++ b/src/lib-sasl/dsasl-client-private.h
@@ -53,9 +53,9 @@ void dsasl_client_mech_register(const struct dsasl_client_mech *mech);
 void dsasl_client_mech_unregister(const struct dsasl_client_mech *mech);
 
 static inline int
-dasl_client_get_channel_binding(struct dsasl_client *client,
-				const char *type, const buffer_t **data_r,
-				const char **error_r)
+dsasl_client_get_channel_binding(struct dsasl_client *client,
+				 const char *type, const buffer_t **data_r,
+				 const char **error_r)
 {
 	if (client->channel_version == SSL_IOSTREAM_PROTOCOL_VERSION_UNKNOWN ||
 	    client->cbinding_callback == NULL) {
diff --git a/src/lib-sasl/mech-scram.c b/src/lib-sasl/mech-scram.c
index 65f0c07b909..a55b53debb3 100644
--- a/src/lib-sasl/mech-scram.c
+++ b/src/lib-sasl/mech-scram.c
@@ -27,7 +27,7 @@ mech_scram_init_channel_binding(struct scram_dsasl_client *sclient,
 	else
 		type = SSL_CHANNEL_BIND_TYPE_TLS_UNIQUE;
 
-	if (dasl_client_get_channel_binding(client, type,
+	if (dsasl_client_get_channel_binding(client, type,
 					    &cbind_data, error_r) < 0)
 		return -1;
 

From 8ebe7d1e231e93fccf04468065fba8ec6208678b Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:59:53 -0500
Subject: [PATCH 17/35] spelling: encountered

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-json/json-parser.c  | 2 +-
 src/lib-mail/message-part.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-json/json-parser.c b/src/lib-json/json-parser.c
index c312e4182cf..ab12f183da7 100644
--- a/src/lib-json/json-parser.c
+++ b/src/lib-json/json-parser.c
@@ -1068,7 +1068,7 @@ json_parser_do_parse_literal(struct json_parser *parser,
 			if ((unichar_t)*p != ch) {
 				json_parser_error(
 					parser, "Expected value '%s', "
-					"but encounted '%s' + %s",
+					"but encountered '%s' + %s",
 					literal, t_strdup_until(literal, p),
 					json_parser_curchar_str(parser));
 				return JSON_PARSE_ERROR;
diff --git a/src/lib-mail/message-part.h b/src/lib-mail/message-part.h
index 41305362052..6a442a65c50 100644
--- a/src/lib-mail/message-part.h
+++ b/src/lib-mail/message-part.h
@@ -68,7 +68,7 @@ bool message_part_is_equal(const struct message_part *p1,
 			   const struct message_part *p2) ATTR_NULL(1, 2);
 
 /* Same as message_part_is_equal(), but it allows to invoke an additional
-   comparator on each incountered part */
+   comparator on each encountered part */
 bool message_part_is_equal_ex(const struct message_part *p1,
 			      const struct message_part *p2,
 			      message_part_comparator_t *equals_ex) ATTR_NULL(1, 2, 3);

From c787b56a61d271abd67b772e758c2cdc91ce5805 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:30:10 -0500
Subject: [PATCH 18/35] spelling: filter

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-settings/settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index e3ecfbaa7c6..8e110475f3c 100644
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -2166,7 +2166,7 @@ settings_instance_override_add_default(struct settings_apply_ctx *ctx,
 		pool_ref(set->pool);
 		if (event_filter_parse_case_sensitive(filter_string,
 						      set->filter, &error) < 0) {
-			i_panic("BUG: Failed to create event filter filter for %s: %s (%s)",
+			i_panic("BUG: Failed to create event filter for %s: %s (%s)",
 				set->orig_key, error, filter_string);
 		}
 		if (array_set->filter != EVENT_FILTER_MATCH_ALWAYS) {

From 5a2a356c23f1dd465c54082f39bd5076943e62bf Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:30:15 -0500
Subject: [PATCH 19/35] spelling: for

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/imap/imap-client.c     | 2 +-
 src/lib-json/json-parser.c | 2 +-
 src/pop3/pop3-client.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index bb20ea4e251..f1eabe2d7d0 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -1216,7 +1216,7 @@ static bool client_skip_line(struct client *client)
 static void client_idle_output_timeout(struct client *client)
 {
 	client_destroy(client, t_strdup_printf(
-		"Client has not read server output for for %"PRIdTIME_T" secs",
+		"Client has not read server output for %"PRIdTIME_T" secs",
 		ioloop_time - client->last_output));
 }
 
diff --git a/src/lib-json/json-parser.c b/src/lib-json/json-parser.c
index ab12f183da7..9eb89e285a1 100644
--- a/src/lib-json/json-parser.c
+++ b/src/lib-json/json-parser.c
@@ -1345,7 +1345,7 @@ json_parser_parse_unicode_escape(struct json_parser *parser,
 			break;
 	}
 	if (ret == JSON_PARSE_NO_DATA) {
-		/* We already checked that 4 octets are available for for hex
+		/* We already checked that 4 octets are available for hex
 		   digits. The only thing that could have happened is that we
 		   encountered the beginnings of an UTF-8 character and no more
 		   input is available. Finish it at a deeper parse level that
diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 6f93a1bc68c..ebfdad94bf3 100644
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -78,7 +78,7 @@ static void client_idle_timeout(struct client *client)
 {
 	if (client->cmd != NULL) {
 		client_destroy(client, t_strdup_printf(
-			"Client has not read server output for for %"PRIdTIME_T" secs",
+			"Client has not read server output for %"PRIdTIME_T" secs",
 			ioloop_time - client->last_output));
 	} else {
 		client_send_line(client, "-ERR Disconnected for inactivity.");

From ad7f250d3077b825efe6995478a40e37601bda78 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 Feb 2025 22:16:56 -0500
Subject: [PATCH 20/35] spelling: fscked

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 .../index/dbox-multi/mdbox-storage-rebuild.c       | 14 +++++++-------
 .../index/dbox-multi/mdbox-storage-rebuild.h       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index e7ef1d9df52..60bd8743c34 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -915,7 +915,7 @@ static bool mdbox_mailbox_is_fscked(struct mailbox *box)
 
 static int
 mdbox_storage_rebuild_scan_prepare(struct mdbox_storage_rebuild_context *ctx,
-				   struct mailbox *fsckd_box,
+				   struct mailbox *fscked_box,
 				   enum mdbox_rebuild_reason reason,
 				   const char **reason_string_r)
 {
@@ -946,9 +946,9 @@ mdbox_storage_rebuild_scan_prepare(struct mdbox_storage_rebuild_context *ctx,
 		   mdbox_map_is_fscked(ctx->storage->map))
 		*reason_string_r = "dovecot.index.map was fsck'd";
 	else if ((reason & MDBOX_REBUILD_REASON_MAILBOX_FSCKD) != 0 &&
-		 mdbox_mailbox_is_fscked(fsckd_box)) {
+		 mdbox_mailbox_is_fscked(fscked_box)) {
 		*reason_string_r = t_strdup_printf(
-			"Mailbox %s index was fsck'd", fsckd_box->vname);
+			"Mailbox %s index was fsck'd", fscked_box->vname);
 	} else {
 		/* storage was already rebuilt by someone else */
 		return 0;
@@ -1001,7 +1001,7 @@ static int mdbox_storage_rebuild_scan(struct mdbox_storage_rebuild_context *ctx,
 static int
 mdbox_storage_rebuild_in_context(struct mdbox_storage *storage,
 				 struct mdbox_map_atomic_context *atomic,
-				 struct mailbox *fsckd_box,
+				 struct mailbox *fscked_box,
 				 enum mdbox_rebuild_reason rebuild_reason)
 {
 	struct mdbox_storage_rebuild_context *ctx;
@@ -1017,7 +1017,7 @@ mdbox_storage_rebuild_in_context(struct mdbox_storage *storage,
 	}
 
 	ctx = mdbox_storage_rebuild_init(storage, atomic);
-	if ((ret = mdbox_storage_rebuild_scan_prepare(ctx, fsckd_box,
+	if ((ret = mdbox_storage_rebuild_scan_prepare(ctx, fscked_box,
 						      rebuild_reason,
 						      &reason_string)) > 0) {
 		struct event_reason *reason = event_reason_begin("mdbox:rebuild");
@@ -1034,7 +1034,7 @@ mdbox_storage_rebuild_in_context(struct mdbox_storage *storage,
 }
 
 int mdbox_storage_rebuild(struct mdbox_storage *storage,
-			  struct mailbox *fsckd_box,
+			  struct mailbox *fscked_box,
 			  enum mdbox_rebuild_reason reason)
 {
 	struct mdbox_map_atomic_context *atomic;
@@ -1042,7 +1042,7 @@ int mdbox_storage_rebuild(struct mdbox_storage *storage,
 
 	atomic = mdbox_map_atomic_begin(storage->map);
 	ret = mdbox_storage_rebuild_in_context(storage, atomic,
-					       fsckd_box, reason);
+					       fscked_box, reason);
 	mdbox_map_atomic_set_success(atomic);
 	mdbox_map_atomic_unset_fscked(atomic);
 	(void)mail_index_reset_fscked(storage->map->index);
diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h
index 6e2c488811c..dcf7d88bb40 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h
@@ -13,7 +13,7 @@ enum mdbox_rebuild_reason {
 };
 
 int mdbox_storage_rebuild(struct mdbox_storage *storage,
-			  struct mailbox *fsckd_box,
+			  struct mailbox *fscked_box,
 			  enum mdbox_rebuild_reason reason);
 
 #endif

From 724d7c9a21e90fc7fe4bc960cbc68d8179b0a6c0 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:01:17 -0500
Subject: [PATCH 21/35] spelling: greater

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/auth/passdb-cache.c                    |  2 +-
 src/doveadm/dsync/dsync-brain-mailbox.c    |  2 +-
 src/doveadm/dsync/dsync-mailbox-import.c   |  4 ++--
 src/lib-http/http-client.h                 |  2 +-
 src/lib-index/mail-index.h                 |  4 ++--
 src/lib-master/service-settings.h          |  2 +-
 src/lib/file-dotlock.c                     |  4 ++--
 src/lib/ioloop.c                           |  2 +-
 src/lib/lib-event.h                        |  2 +-
 src/master/master-settings.c               | 10 +++++-----
 src/plugins/acl/acl-backend-vfile-update.c |  4 ++--
 src/plugins/quota/quota-imapc.c            |  2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/auth/passdb-cache.c b/src/auth/passdb-cache.c
index 269ce49248a..3759aa4e24d 100644
--- a/src/auth/passdb-cache.c
+++ b/src/auth/passdb-cache.c
@@ -195,7 +195,7 @@ void passdb_cache_init(const struct auth_settings *set)
 
 	if (restrict_get_process_size(&limit) == 0 &&
 	    set->cache_size > (uoff_t)limit) {
-		i_warning("auth_cache_size (%"PRIuUOFF_T"M) is higher than "
+		i_warning("auth_cache_size (%"PRIuUOFF_T"M) is greater than "
 			  "process VSZ limit (%"PRIuUOFF_T"M)",
 			  set->cache_size/1024/1024,
 			  (uoff_t)(limit/1024/1024));
diff --git a/src/doveadm/dsync/dsync-brain-mailbox.c b/src/doveadm/dsync/dsync-brain-mailbox.c
index 965fb514f68..7527ef3cd85 100644
--- a/src/doveadm/dsync/dsync-brain-mailbox.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox.c
@@ -296,7 +296,7 @@ int dsync_brain_sync_mailbox_open(struct dsync_brain *brain,
 	}
 
 	if (last_common_uid != 0) {
-		/* if last_common_* is higher than our current ones it means
+		/* if last_common_* is greater than our current ones it means
 		   that the incremental sync state is stale and we need to do
 		   a full resync */
 		if (status.uidnext < last_common_uid) {
diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 07f0733fba6..71e1313c690 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -1985,10 +1985,10 @@ dsync_mailbox_import_saved_newmail(struct dsync_mailbox_importer *importer,
 	   are larger than we're committing.
 
 	   Note that if any existing UIDs have been changed, the new UID is
-	   usually higher than anything that is being saved so we can't do
+	   usually greater than anything that is being saved so we can't do
 	   an intermediate commit. It's too much extra work to try to handle
 	   that situation. So here this never happens, because then
-	   array_count(wanted_uids) is always higher than first_unsaved_idx. */
+	   array_count(wanted_uids) is always greater than first_unsaved_idx. */
 	if (importer->saves_since_commit >= importer->commit_msgs_interval &&
 	    importer->first_unsaved_idx == array_count(&importer->wanted_uids)) {
 		if (dsync_mailbox_import_commit(importer, FALSE) < 0)
diff --git a/src/lib-http/http-client.h b/src/lib-http/http-client.h
index 4d83499fc28..cb0ad5b9b6b 100644
--- a/src/lib-http/http-client.h
+++ b/src/lib-http/http-client.h
@@ -88,7 +88,7 @@ struct http_client_settings {
 	   if > 0, the maximum will be enforced across all IPs for that host,
 	   meaning that IPs may be tried more than once eventually if the number
 	   of IPs is smaller than the specified maximum attempts. If the number
-	   of IPs is higher than the maximum attempts, not all IPs are tried.
+	   of IPs is greater than the maximum attempts, not all IPs are tried.
 	   If 0, all IPs are tried at most once.
 	 */
 	unsigned int max_connect_attempts;
diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index 0190bd984a5..30c419677a6 100644
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -94,7 +94,7 @@ struct mail_index_header {
 	/* Minor version is increased when the file format changes in a
 	   backwards compatible way. If the field is smaller than
 	   MAIL_INDEX_MINOR_VERSION, upgrade the file format and update the
-	   minor_version field as well. If minor_version is higher than
+	   minor_version field as well. If minor_version is greater than
 	   MAIL_INDEX_MINOR_VERSION, leave it as it is. It likely means that a
 	   new Dovecot version is currently being upgraded to, but the file was
 	   still accessed by an old version. */
@@ -634,7 +634,7 @@ void mail_index_lookup_first(struct mail_index_view *view,
 void mail_index_append(struct mail_index_transaction *t, uint32_t uid,
 		       uint32_t *seq_r);
 /* Assign new UIDs for mails with uid=0 or uid<min_allowed_uid. All the new
-   UIDs are >= first_new_uid, and also higher than the highest seen uid (i.e. it
+   UIDs are >= first_new_uid, and also greater than the highest seen uid (i.e. it
    doesn't try to fill UID gaps). Assumes that mailbox is locked in a way that
    UIDs can be safely assigned. Returns UIDs for all assigned messages, in
    their sequence order (so UIDs are not necessary ascending). */
diff --git a/src/lib-master/service-settings.h b/src/lib-master/service-settings.h
index 40c0076459d..9f1e2074758 100644
--- a/src/lib-master/service-settings.h
+++ b/src/lib-master/service-settings.h
@@ -89,7 +89,7 @@ struct service_settings {
 
 	/* -- flags that can be set internally -- */
 
-	/* process_limit must not be higher than 1 */
+	/* process_limit must not be greater than 1 */
 	bool process_limit_1:1;
 };
 ARRAY_DEFINE_TYPE(service_settings, struct service_settings *);
diff --git a/src/lib/file-dotlock.c b/src/lib/file-dotlock.c
index 29901bf3156..a5a47e7b365 100644
--- a/src/lib/file-dotlock.c
+++ b/src/lib/file-dotlock.c
@@ -144,8 +144,8 @@ update_change_info(const struct stat *st, struct file_change_info *change,
 
 		if (change->ctime == 0) {
 			/* First check, set last_change to file's change time.
-			   Use mtime instead if it's higher, but only if it's
-			   not higher than current time, because the mtime
+			   Use mtime instead if it's greater, but only if it's
+			   not greater than current time, because the mtime
 			   can also be used for keeping metadata. */
 			change_time = st->st_mtime <= now &&
 				(st->st_mtime > st->st_ctime || !check_ctime) ?
diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c
index 2485eec28ce..3d28c75975b 100644
--- a/src/lib/ioloop.c
+++ b/src/lib/ioloop.c
@@ -432,7 +432,7 @@ timeout_reset_timeval(struct timeout *timeout, struct timeval *tv_now)
 	/* If we came here from io_loop_handle_timeouts_real(), next_run must
 	   be larger than tv_now or it can go to infinite loop. This would
 	   mainly happen with 0 ms timeouts. Avoid this by making sure
-	   next_run is at least 1 us higher than tv_now.
+	   next_run is at least 1 us greater than tv_now.
 
 	   Note that some callers (like master process's process_min_avail
 	   preforking timeout) really do want the 0 ms timeout to trigger
diff --git a/src/lib/lib-event.h b/src/lib/lib-event.h
index d005d8ea02f..d08cc75b510 100644
--- a/src/lib/lib-event.h
+++ b/src/lib/lib-event.h
@@ -260,7 +260,7 @@ struct event *event_replace_log_prefix(struct event *event, const char *prefix);
 
 /* Drop count prefixes from parents when this event is used for logging. This
    does not affect the parent events. This only counts actual prefixes and not
-   parents. If the count is higher than the actual number of prefixes added by
+   parents. If the count is greater than the actual number of prefixes added by
    parents, all will be dropped. */
 struct event *
 event_drop_parent_log_prefixes(struct event *event, unsigned int count);
diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 083b3d8375b..51c2b1dc5fa 100644
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -727,32 +727,32 @@ master_settings_ext_check(struct event *event, void *_set,
 		process_limit = service->process_limit;
 		if (process_limit == 0) {
 			*error_r = t_strdup_printf("service(%s): "
-				"process_limit must be higher than 0",
+				"process_limit must be greater than 0",
 				service->name);
 			return FALSE;
 		}
 		if (service->process_min_avail > process_limit) {
 			*error_r = t_strdup_printf("service(%s): "
-				"process_min_avail is higher than process_limit",
+				"process_min_avail is greater than process_limit",
 				service->name);
 			return FALSE;
 		}
 		if (service->client_limit == 0) {
 			*error_r = t_strdup_printf("service(%s): "
-				"client_limit must be higher than 0",
+				"client_limit must be greater than 0",
 				service->name);
 			return FALSE;
 		}
 		if (service->restart_request_count == 0) {
 			*error_r = t_strdup_printf("service(%s): "
-				"restart_request_count must be higher than 0 "
+				"restart_request_count must be greater than 0 "
 				"(did you mean \"unlimited\"?)",
 				service->name);
 			return FALSE;
 		}
 		if (service->idle_kill_interval == 0) {
 			*error_r = t_strdup_printf("service(%s): "
-				"idle_kill_interval must be higher than 0 "
+				"idle_kill_interval must be greater than 0 "
 				"(did you mean \"unlimited\"?)",
 				service->name);
 			return FALSE;
diff --git a/src/plugins/acl/acl-backend-vfile-update.c b/src/plugins/acl/acl-backend-vfile-update.c
index 1c81a4f8fe5..933034f7aea 100644
--- a/src/plugins/acl/acl-backend-vfile-update.c
+++ b/src/plugins/acl/acl-backend-vfile-update.c
@@ -241,8 +241,8 @@ int acl_backend_vfile_object_update(struct acl_object *_aclobj,
 		return -1;
 	}
 	if (orig_mtime < update->last_change && update->last_change != 0) {
-		/* set mtime to last_change, if it's higher than the file's
-		   original mtime. if original mtime is higher, then we're
+		/* set mtime to last_change, if it's greater than the file's
+		   original mtime. if original mtime is greater, then we're
 		   merging some changes and it's better for the mtime to get
 		   updated. */
 		ut.actime = ioloop_time;
diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c
index 87d664f3cc4..14221596ac5 100644
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -282,7 +282,7 @@ imapc_quota_refresh_update(struct quota *quota,
 			root->bytes_last = refresh_root->bytes_cur;
 			root->count_last = refresh_root->count_cur;
 
-			/* If limits are higher than what dovecot can handle
+			/* If limits are greater than what dovecot can handle
 			   consider them unlimited. */
 			if (refresh_root->bytes_limit > INT64_MAX)
 				root->root.bytes_limit = 0;

From 7750df05649bc217837a185bc3153796a5c42a45 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sat, 15 Feb 2025 23:51:18 -0500
Subject: [PATCH 22/35] spelling: header size

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-index/mail-index-map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-index/mail-index-map.c b/src/lib-index/mail-index-map.c
index b3aeb07ffa0..70e384c9c69 100644
--- a/src/lib-index/mail-index-map.c
+++ b/src/lib-index/mail-index-map.c
@@ -221,7 +221,7 @@ int mail_index_map_ext_hdr_check(const struct mail_index_header *hdr,
 			return -1;
 	}
 	if (ext_hdr->hdr_size > MAIL_INDEX_EXT_HEADER_MAX_SIZE) {
-		*error_r = t_strdup_printf("Headersize too large (%u)",
+		*error_r = t_strdup_printf("Header size too large (%u)",
 					   ext_hdr->hdr_size);
 		return -1;
 	}

From 89d655de3d893092517becc84576089ffe1728c8 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 Feb 2025 22:21:49 -0500
Subject: [PATCH 23/35] spelling: hexdigest

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-dcrypt/istream-decrypt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-dcrypt/istream-decrypt.c b/src/lib-dcrypt/istream-decrypt.c
index 11daa277d6e..edfffa177be 100644
--- a/src/lib-dcrypt/istream-decrypt.c
+++ b/src/lib-dcrypt/istream-decrypt.c
@@ -375,12 +375,12 @@ i_stream_decrypt_key(struct decrypt_istream *stream, const char *malg,
 				break;
 			}
 		} else if (stream->key_callback != NULL) {
-			const char *hexdgst = /* digest length */
+			const char *hexdigest = /* digest length */
 				binary_to_hex(data, sizeof(digest));
 			if (stream->priv_key != NULL)
 				dcrypt_key_unref_private(&stream->priv_key);
 			/* hope you going to give us right key.. */
-			int ret = stream->key_callback(hexdgst,
+			int ret = stream->key_callback(hexdigest,
 				&stream->priv_key, &error, stream->key_context);
 			if (ret < 0) {
 				io_stream_set_error(&stream->istream.iostream,

From c5eed1fa8422f9f0be6e2985c00262b08b52cf60 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:13:38 -0500
Subject: [PATCH 24/35] spelling: hyphen

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-language/test-lang-tokenizer.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib-language/test-lang-tokenizer.c b/src/lib-language/test-lang-tokenizer.c
index da9d61b5c8d..7412116462d 100644
--- a/src/lib-language/test-lang-tokenizer.c
+++ b/src/lib-language/test-lang-tokenizer.c
@@ -40,8 +40,8 @@ static void init_lang_settings(void)
 	"trailing, period@blue.com. " \
 	"multi-trialing, mul@trail.com..... " \
 	"m@s " \
-	"hypen@hypen-hypen.com " \
-	"hypen@hypen-hypen-sick.com.-"
+	"hyphen@hyphen-hyphen.com " \
+	"hyphen@hyphen-hyphen-sick.com.-"
 
 static const char *test_inputs[] = {
 	/* generic things and word truncation: */
@@ -339,8 +339,8 @@ static void test_lang_tokenizer_address_only(void)
 		"period@blue.com", /*trailing period '.' in email */
 		"mul@trail.com",
 		"m@s", /*one letter local-part and domain name */
-		"hypen@hypen-hypen.com",
-		"hypen@hypen-hypen-sick.com",
+		"hyphen@hyphen-hyphen.com",
+		"hyphen@hyphen-hyphen-sick.com",
 		NULL
 	};
 	struct lang_tokenizer *tok;
@@ -375,8 +375,8 @@ static void test_lang_tokenizer_address_parent(const char *name, struct lang_set
 		"trailing", "period", "blue", "com", "period@blue.com",
 		"multi", "trialing", "mul", "trail", "com", "mul@trail.com",
 		"m", "m@s", "s",
-		"hypen", "hypen", "hypen", "hypen@hypen-hypen.com", "com",
-		"hypen", "hypen", "hypen", "sick", "com", "hypen@hypen-hypen-sick.com",
+		"hyphen", "hyphen", "hyphen", "hyphen@hyphen-hyphen.com", "com",
+		"hyphen", "hyphen", "hyphen", "sick", "com", "hyphen@hyphen-hyphen-sick.com",
 		NULL
 	};
 	struct lang_tokenizer *tok, *gen_tok;
@@ -423,8 +423,8 @@ static void test_lang_tokenizer_address_search(void)
 		"trailing", "period@blue.com",
 		"multi", "trialing", "mul@trail.com",
 		"m@s",
-		"hypen@hypen-hypen.com",
-		"hypen@hypen-hypen-sick.com",
+		"hyphen@hyphen-hyphen.com",
+		"hyphen@hyphen-hyphen-sick.com",
 		NULL
 	};
 	struct lang_tokenizer *tok, *gen_tok;

From bf5969bfcabd551c3c3b4639446b082ca6066b6a Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:51:48 -0500
Subject: [PATCH 25/35] spelling: its

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-json/test-json-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-json/test-json-parser.c b/src/lib-json/test-json-parser.c
index f5e8f9f5f30..5c5031a1434 100644
--- a/src/lib-json/test-json-parser.c
+++ b/src/lib-json/test-json-parser.c
@@ -2054,7 +2054,7 @@ invalid_parse_tests[] = {
 	},
 	{
 		// invalid/lone-second-surrogate/input
-		.input = "[\"\\uDFAA (second surrogate on it's own)\"]\n",
+		.input = "[\"\\uDFAA (second surrogate on its own)\"]\n",
 	},
 	{
 		// invalid/negative-integer-starting-with-zero/input

From 94bd421bfd566d414412a17610ecad7e7c03067f Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:01:22 -0500
Subject: [PATCH 26/35] spelling: less

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-http/http-client.h | 2 +-
 src/lib-index/mail-index.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-http/http-client.h b/src/lib-http/http-client.h
index cb0ad5b9b6b..bcc6729a80f 100644
--- a/src/lib-http/http-client.h
+++ b/src/lib-http/http-client.h
@@ -87,7 +87,7 @@ struct http_client_settings {
 
 	   if > 0, the maximum will be enforced across all IPs for that host,
 	   meaning that IPs may be tried more than once eventually if the number
-	   of IPs is smaller than the specified maximum attempts. If the number
+	   of IPs is less than the specified maximum attempts. If the number
 	   of IPs is greater than the maximum attempts, not all IPs are tried.
 	   If 0, all IPs are tried at most once.
 	 */
diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index 30c419677a6..9ffa3bad133 100644
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -92,7 +92,7 @@ struct mail_index_header {
 	   don't even try to read it. */
 	uint8_t major_version;
 	/* Minor version is increased when the file format changes in a
-	   backwards compatible way. If the field is smaller than
+	   backwards compatible way. If the field is less than
 	   MAIL_INDEX_MINOR_VERSION, upgrade the file format and update the
 	   minor_version field as well. If minor_version is greater than
 	   MAIL_INDEX_MINOR_VERSION, leave it as it is. It likely means that a

From 34d72bbfc5a7e0307800d2501a70429c755a0a1f Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:16:14 -0500
Subject: [PATCH 27/35] spelling: mailbox

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-storage/test-mailbox-list.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib-storage/test-mailbox-list.c b/src/lib-storage/test-mailbox-list.c
index 45959991f1a..0db113c0dc8 100644
--- a/src/lib-storage/test-mailbox-list.c
+++ b/src/lib-storage/test-mailbox-list.c
@@ -265,7 +265,7 @@ test_mailbox_list_get_hierarchy_sep(struct mailbox_list *list ATTR_UNUSED)
 }
 
 static void
-test_maibox_list_name_init(struct mailbox_list *list,
+test_mailbox_list_name_init(struct mailbox_list *list,
 			   const struct test_mailbox_list_name *test,
 			   bool mutf7)
 {
@@ -483,7 +483,7 @@ static void test_mailbox_list_get_names(void)
 	test_begin("mailbox list get names");
 	for (unsigned int i = 0; i < N_ELEMENTS(tests); i++) {
 		if ((tests[i].flags & TEST_FLAG_NO_MUTF7) == 0) {
-			test_maibox_list_name_init(&list, &tests[i], TRUE);
+			test_mailbox_list_name_init(&list, &tests[i], TRUE);
 			if ((tests[i].flags & TEST_FLAG_NO_STORAGE_NAME) == 0) {
 				test_assert_strcmp_idx(mailbox_list_default_get_storage_name(&list, tests[i].vname),
 						       tests[i].storage_name, i);
@@ -494,7 +494,7 @@ static void test_mailbox_list_get_names(void)
 			}
 		}
 		if ((tests[i].flags & TEST_FLAG_NO_UTF8) == 0) {
-			test_maibox_list_name_init(&list, &tests[i], FALSE);
+			test_mailbox_list_name_init(&list, &tests[i], FALSE);
 			if ((tests[i].flags & TEST_FLAG_NO_STORAGE_NAME) == 0) {
 				test_assert_strcmp_idx(mailbox_list_default_get_storage_name(&list, tests[i].vname),
 						       tests[i].storage_name, i);

From 592aeaaf756c622a78659ff7b4486d673b4eb657 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:51:59 -0500
Subject: [PATCH 28/35] spelling: nonexistent

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/plugins/fts-flatcurve/fts-backend-flatcurve.c | 2 +-
 src/stats/stats-metrics.c                         | 2 +-
 src/stats/stats-settings.c                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c
index c44707584fe..009dc8fed75 100644
--- a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c
+++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c
@@ -482,7 +482,7 @@ fts_backend_flatcurve_rescan_box(struct flatcurve_fts_backend *backend,
 				u2, u);
 		} else {
 			e_debug(e->add_str("status", "expunge_msgs")->event(),
-				"Rescan: expunge non-existent messages "
+				"Rescan: expunge nonexistent messages "
 				"expunged=%s", u);
 		}
 	} T_END;
diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index 0dfb5c81fce..9926813b353 100644
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -146,7 +146,7 @@ static int stats_metrics_add_set(struct stats_metrics *metrics,
 		exporter = stats_metrics_exporter_find(metrics, set->exporter);
 		if (exporter == NULL) {
 			*error_r = t_strdup_printf("metric %s refers to "
-						   "non-existent exporter '%s'",
+						   "nonexistent exporter '%s'",
 						   set->name,
 						   set->exporter);
 			return -1;
diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c
index 6fe62f85c73..1853c2d6d59 100644
--- a/src/stats/stats-settings.c
+++ b/src/stats/stats-settings.c
@@ -602,7 +602,7 @@ stats_settings_ext_check(struct event *event, void *_set,
 		}
 		if (ret == 0) {
 			*error_r = t_strdup_printf("metric %s refers to "
-						   "non-existent exporter '%s'",
+						   "nonexistent exporter '%s'",
 						   metric_name,
 						   metric_exporter);
 			return FALSE;

From 2128d343940bd73d08fa809d06afc4bcc0a426ae Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:19:59 -0500
Subject: [PATCH 29/35] spelling: occurred

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-lua/dlua-resume.c      | 2 +-
 src/lib-sql/driver-cassandra.c | 2 +-
 src/lib/lib-event.h            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib-lua/dlua-resume.c b/src/lib-lua/dlua-resume.c
index c142dcbc018..90cc3e7e356 100644
--- a/src/lib-lua/dlua-resume.c
+++ b/src/lib-lua/dlua-resume.c
@@ -39,7 +39,7 @@ static void queue_resume_callback(lua_State *L, int status)
 	if (status != LUA_OK) {
 		int ret;
 
-		/* error occured: run debug.traceback() */
+		/* error occurred: run debug.traceback() */
 
 		/* stack: ..., error (top) */
 		lua_getglobal(L, "debug");
diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 5e0497514e4..849e6027376 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -1403,7 +1403,7 @@ driver_cassandra_error_is_uncertain(CassError error)
 	case CASS_ERROR_LIB_REQUEST_TIMED_OUT:
 		/* A request sent from the driver has timed out. */
 	case CASS_ERROR_LIB_WRITE_ERROR:
-		/* A write error occured. */
+		/* A write error occurred. */
 		return SQL_RESULT_ERROR_TYPE_WRITE_UNCERTAIN;
 	default:
 		return SQL_RESULT_ERROR_TYPE_UNKNOWN;
diff --git a/src/lib/lib-event.h b/src/lib/lib-event.h
index d08cc75b510..d3b321ec507 100644
--- a/src/lib/lib-event.h
+++ b/src/lib/lib-event.h
@@ -138,7 +138,7 @@ struct event *event_flatten(struct event *src);
    and categories to avoid sending one-off parent events.  (There is a more
    detailed description in a comment above the function implementation.)
    A new reference to the source event is returned if no simplification
-   occured. Event pointers are dropped if a new event was created. */
+   occurred. Event pointers are dropped if a new event was created. */
 struct event *event_minimize(struct event *src);
 /* Copy all categories from source to dest.
    Only the categories in source event itself are copied.

From 3a8ec7501e76e00334908363bf6f1e8788cb424a Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 Feb 2025 23:13:38 -0500
Subject: [PATCH 30/35] spelling: search

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-storage/index/index-search-mime.c | 44 +++++++++++------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/lib-storage/index/index-search-mime.c b/src/lib-storage/index/index-search-mime.c
index ab5c78fb60e..7dfada63972 100644
--- a/src/lib-storage/index/index-search-mime.c
+++ b/src/lib-storage/index/index-search-mime.c
@@ -30,7 +30,7 @@ struct search_mimepart_context {
 static void search_mime_arg(struct mail_search_mime_arg *arg,
 			      struct search_mimepart_context *mpctx);
 
-static int seach_arg_mime_parent_match(struct search_mimepart_context *mpctx,
+static int search_arg_mime_parent_match(struct search_mimepart_context *mpctx,
 				   struct mail_search_mime_arg *args)
 {
 	struct message_part *part = mpctx->mime_part;
@@ -68,7 +68,7 @@ static int seach_arg_mime_parent_match(struct search_mimepart_context *mpctx,
 	return ret;
 }
 
-static int seach_arg_mime_child_match(struct search_mimepart_context *mpctx,
+static int search_arg_mime_child_match(struct search_mimepart_context *mpctx,
 				   struct mail_search_mime_arg *args)
 {
 	struct message_part *part, *prev_part;
@@ -155,7 +155,7 @@ static int seach_arg_mime_child_match(struct search_mimepart_context *mpctx,
 }
 
 static int
-seach_arg_mime_substring_match(
+search_arg_mime_substring_match(
 	struct search_mimepart_context *mpctx ATTR_UNUSED,
 	const char *key, const char *value)
 {
@@ -167,7 +167,7 @@ seach_arg_mime_substring_match(
 }
 
 static int
-seach_arg_mime_envelope_time_match(
+search_arg_mime_envelope_time_match(
 	struct search_mimepart_context *mpctx ATTR_UNUSED,
 	enum mail_search_mime_arg_type type, time_t search_time,
 	const struct message_part_envelope *envelope)
@@ -200,7 +200,7 @@ seach_arg_mime_envelope_time_match(
 }
 
 static int
-seach_arg_mime_envelope_address_match(
+search_arg_mime_envelope_address_match(
 	struct search_mimepart_context *mpctx ATTR_UNUSED,
 	enum mail_search_mime_arg_type type, const char *key,
 	const struct message_part_envelope *envelope)
@@ -244,7 +244,7 @@ seach_arg_mime_envelope_address_match(
 }
 
 static int
-seach_arg_mime_filename_match(struct search_mimepart_context *mpctx,
+search_arg_mime_filename_match(struct search_mimepart_context *mpctx,
 				   struct mail_search_mime_arg *arg)
 {
 	struct index_search_context *ictx = mpctx->index_ctx;
@@ -303,7 +303,7 @@ search_arg_mime_filename_deinit(
 }
 
 static int
-seach_arg_mime_param_match(const struct message_part_param *params,
+search_arg_mime_param_match(const struct message_part_param *params,
 				   unsigned int params_count,
 				   const char *name, const char *key)
 {
@@ -322,7 +322,7 @@ seach_arg_mime_param_match(const struct message_part_param *params,
 }
 
 static int
-seach_arg_mime_language_match(struct search_mimepart_context *mpctx,
+search_arg_mime_language_match(struct search_mimepart_context *mpctx,
 				   const char *key)
 {
 	struct message_part_data *data = mpctx->mime_part->data;
@@ -364,14 +364,14 @@ static int search_mime_arg_match(struct search_mimepart_context *mpctx,
 		return (part->body_size.virtual_size < arg->value.size ? 1 : 0);
 
 	case SEARCH_MIME_DESCRIPTION:
-		return seach_arg_mime_substring_match(mpctx,
+		return search_arg_mime_substring_match(mpctx,
 			arg->value.str, data->content_description);
 	case SEARCH_MIME_DISPOSITION_TYPE:
 		return (data->content_disposition != NULL &&
 			strcasecmp(data->content_disposition,
 				arg->value.str) == 0 ? 1 : 0);
 	case SEARCH_MIME_DISPOSITION_PARAM:
-		return seach_arg_mime_param_match
+		return search_arg_mime_param_match
 			(data->content_disposition_params,
 				data->content_disposition_params_count,
 				arg->field_name, arg->value.str);
@@ -384,7 +384,7 @@ static int search_mime_arg_match(struct search_mimepart_context *mpctx,
 			strcasecmp(data->content_id,
 				arg->value.str) == 0 ? 1 : 0);
 	case SEARCH_MIME_LANGUAGE:
-		return seach_arg_mime_language_match(mpctx, arg->value.str);
+		return search_arg_mime_language_match(mpctx, arg->value.str);
 	case SEARCH_MIME_LOCATION:
 		return (data->content_location != NULL &&
 			strcasecmp(data->content_location,
@@ -403,7 +403,7 @@ static int search_mime_arg_match(struct search_mimepart_context *mpctx,
 			strcasecmp(data->content_subtype,
 				arg->value.str) == 0 ? 1 : 0);
 	case SEARCH_MIME_PARAM:
-		return seach_arg_mime_param_match
+		return search_arg_mime_param_match
 			(data->content_type_params,
 				data->content_type_params_count,
 				arg->field_name, arg->value.str);
@@ -411,7 +411,7 @@ static int search_mime_arg_match(struct search_mimepart_context *mpctx,
 	case SEARCH_MIME_SENTBEFORE:
 	case SEARCH_MIME_SENTON:
 	case SEARCH_MIME_SENTSINCE:
-		return seach_arg_mime_envelope_time_match
+		return search_arg_mime_envelope_time_match
 			(mpctx, arg->type, arg->value.time, data->envelope);
 
 	case SEARCH_MIME_CC:
@@ -420,23 +420,23 @@ static int search_mime_arg_match(struct search_mimepart_context *mpctx,
 	case SEARCH_MIME_REPLY_TO:
 	case SEARCH_MIME_SENDER:
 	case SEARCH_MIME_TO:
-		return seach_arg_mime_envelope_address_match
+		return search_arg_mime_envelope_address_match
 			(mpctx, arg->type, arg->value.str, data->envelope);
 
 	case SEARCH_MIME_SUBJECT:
 		if (data->envelope == NULL)
 			return 0;
-		return seach_arg_mime_substring_match(mpctx,
+		return search_arg_mime_substring_match(mpctx,
 			arg->value.str, data->envelope->subject);
 	case SEARCH_MIME_IN_REPLY_TO:
 		if (data->envelope == NULL)
 			return 0;
-		return seach_arg_mime_substring_match(mpctx,
+		return search_arg_mime_substring_match(mpctx,
 			arg->value.str, data->envelope->in_reply_to);
 	case SEARCH_MIME_MESSAGE_ID:
 		if (data->envelope == NULL)
 			return 0;
-		return seach_arg_mime_substring_match(mpctx,
+		return search_arg_mime_substring_match(mpctx,
 			arg->value.str, data->envelope->message_id);
 
 	case SEARCH_MIME_DEPTH_EQUAL:
@@ -449,15 +449,15 @@ static int search_mime_arg_match(struct search_mimepart_context *mpctx,
 		return (mpctx->index == arg->value.number ? 1 : 0);
 
 	case SEARCH_MIME_PARENT:
-		return seach_arg_mime_parent_match(mpctx, arg);
+		return search_arg_mime_parent_match(mpctx, arg);
 	case SEARCH_MIME_CHILD:
-		return seach_arg_mime_child_match(mpctx, arg);
+		return search_arg_mime_child_match(mpctx, arg);
 
 	case SEARCH_MIME_FILENAME_IS:
 	case SEARCH_MIME_FILENAME_CONTAINS:
 	case SEARCH_MIME_FILENAME_BEGINS:
 	case SEARCH_MIME_FILENAME_ENDS:
-		return seach_arg_mime_filename_match(mpctx, arg);
+		return search_arg_mime_filename_match(mpctx, arg);
 
 	case SEARCH_MIME_HEADER:
 	case SEARCH_MIME_BODY:
@@ -483,7 +483,7 @@ static void search_mime_arg(struct mail_search_mime_arg *arg,
 	}
 }
 
-static int seach_arg_mime_parts_match(struct search_mimepart_context *mpctx,
+static int search_arg_mime_parts_match(struct search_mimepart_context *mpctx,
 				   struct mail_search_mime_arg *args,
 				   struct message_part *parts)
 {
@@ -553,7 +553,7 @@ static int search_arg_match_mimepart(struct search_mimepart_context *mpctx,
 
 	/* FIXME: implement HEADER, BODY and TEXT (not from BODYSTRUCTURE)
 	   Needs to support FTS */
-	return seach_arg_mime_parts_match
+	return search_arg_mime_parts_match
 		(mpctx, arg->value.mime_part->args, mpctx->mime_parts);
 }
 

From 34eb65db99ecf56519b26f1620fb32a015fca481 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:34:40 -0500
Subject: [PATCH 31/35] spelling: spurious

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-master/master-service-haproxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-master/master-service-haproxy.c b/src/lib-master/master-service-haproxy.c
index d312b89e55e..57d4bf54d94 100644
--- a/src/lib-master/master-service-haproxy.c
+++ b/src/lib-master/master-service-haproxy.c
@@ -599,7 +599,7 @@ master_service_haproxy_read(struct master_service_haproxy_conn *hpconn)
 
 			if (*fields != NULL) {
 				e_error(hpconn->event, "Client disconnected: "
-					"Header line has spurius extra field "
+					"Header line has spurious extra field "
 					"(field=`%s', rip=%s)", str_sanitize(*fields, 64),
 					net_ip2addr(real_remote_ip));
 				return -1;

From 983e9fd27e530f7172589c46d36eeb401527685d Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 Feb 2025 23:17:55 -0500
Subject: [PATCH 32/35] spelling: timeout

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-smtp/test-smtp-submit.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
index b19c1802d83..4c80623bf60 100644
--- a/src/lib-smtp/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -1150,7 +1150,7 @@ static void test_data_disconnect(void)
 
 /* server */
 
-enum _data_timout_state {
+enum _data_timeout_state {
 	DATA_TIMEOUT_STATE_EHLO = 0,
 	DATA_TIMEOUT_STATE_MAIL_FROM,
 	DATA_TIMEOUT_STATE_RCPT_TO,
@@ -1158,20 +1158,20 @@ enum _data_timout_state {
 	DATA_TIMEOUT_STATE_FINISH
 };
 
-struct _data_timout_server {
-	enum _data_timout_state state;
+struct _data_timeout_server {
+	enum _data_timeout_state state;
 };
 
-static void test_data_timout_input(struct server_connection *conn)
+static void test_data_timeout_input(struct server_connection *conn)
 {
-	struct _data_timout_server *ctx;
+	struct _data_timeout_server *ctx;
 	const char *line;
 
 	if (conn->context == NULL) {
-		ctx = p_new(conn->pool, struct _data_timout_server, 1);
+		ctx = p_new(conn->pool, struct _data_timeout_server, 1);
 		conn->context = (void*)ctx;
 	} else {
-		ctx = (struct _data_timout_server *)conn->context;
+		ctx = (struct _data_timeout_server *)conn->context;
 	}
 
 	for (;;) {
@@ -1217,24 +1217,24 @@ static void test_data_timout_input(struct server_connection *conn)
 	}
 }
 
-static void test_data_timout_init(struct server_connection *conn)
+static void test_data_timeout_init(struct server_connection *conn)
 {
 	o_stream_nsend_str(
 		conn->conn.output,
 		"220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
-static void test_server_data_timout(unsigned int index)
+static void test_server_data_timeout(unsigned int index)
 {
-	test_server_init = test_data_timout_init;
-	test_server_input = test_data_timout_input;
+	test_server_init = test_data_timeout_init;
+	test_server_input = test_data_timeout_input;
 	test_server_run(index);
 }
 
 /* client */
 
 static bool
-test_client_data_timout(const struct smtp_submit_settings *submit_set)
+test_client_data_timeout(const struct smtp_submit_settings *submit_set)
 {
 	time_t time;
 	const char *error = NULL;
@@ -1264,8 +1264,8 @@ static void test_data_timeout(void)
 	test_begin("data timeout");
 	test_expect_errors(1);
 	test_run_client_server(&smtp_submit_set,
-			       test_client_data_timout,
-			       test_server_data_timout, 1);
+			       test_client_data_timeout,
+			       test_server_data_timeout, 1);
 	test_end();
 }
 

From 8607ed7e3ebd121f2aaa6033928f2cad95d2f066 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:37:13 -0500
Subject: [PATCH 33/35] spelling: trailing

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-language/test-lang-tokenizer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib-language/test-lang-tokenizer.c b/src/lib-language/test-lang-tokenizer.c
index 7412116462d..ea0051063cb 100644
--- a/src/lib-language/test-lang-tokenizer.c
+++ b/src/lib-language/test-lang-tokenizer.c
@@ -38,7 +38,7 @@ static void init_lang_settings(void)
 	"foo, foo@domain " \
 	"abcdefghijklmnopqrstuvxyz.abcdefghijklmnopqrstuvxyzabcdefghijklmnopqrstuvxyz@1bcdefghijklmnopqrstuvxy1.2bcdefghijklmnopqrstuvxy2.3bcdefghijklmnopqrstuvxy3.4bcdefghijklmnopqrstuvxy4.5bcdefghijklmnopqrstuvxy5.6bcdefghijklmnopqrstuvxy6.7bcdefghijklmnopqrstuvxy7.8bcdefghijklmnopqrstuvxy8.9bcdefghijklmnopqrstuvxy9.0bcdefghijklmnopqrstuvxy0.tld " \
 	"trailing, period@blue.com. " \
-	"multi-trialing, mul@trail.com..... " \
+	"multi-trailing, mul@trail.com..... " \
 	"m@s " \
 	"hyphen@hyphen-hyphen.com " \
 	"hyphen@hyphen-hyphen-sick.com.-"
@@ -373,7 +373,7 @@ static void test_lang_tokenizer_address_parent(const char *name, struct lang_set
 		"9bcdefghijklmnopqrstuvxy9",
 		"0bcdefghijklmnopqrstuvxy0", "tld",
 		"trailing", "period", "blue", "com", "period@blue.com",
-		"multi", "trialing", "mul", "trail", "com", "mul@trail.com",
+		"multi", "trailing", "mul", "trail", "com", "mul@trail.com",
 		"m", "m@s", "s",
 		"hyphen", "hyphen", "hyphen", "hyphen@hyphen-hyphen.com", "com",
 		"hyphen", "hyphen", "hyphen", "sick", "com", "hyphen@hyphen-hyphen-sick.com",
@@ -421,7 +421,7 @@ static void test_lang_tokenizer_address_search(void)
 		"9bcdefghijklmnopqrstuvxy9",
 		"0bcdefghijklmnopqrstuvxy0", "tld",
 		"trailing", "period@blue.com",
-		"multi", "trialing", "mul@trail.com",
+		"multi", "trailing", "mul@trail.com",
 		"m@s",
 		"hyphen@hyphen-hyphen.com",
 		"hyphen@hyphen-hyphen-sick.com",

From 8df22cf00d03ca67e821cbc7aa323bcb0ba9fd89 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:56:30 -0500
Subject: [PATCH 34/35] spelling: unwind

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 m4/want_unwind.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4
index 1ce87f1a603..3a6735604f9 100644
--- a/m4/want_unwind.m4
+++ b/m4/want_unwind.m4
@@ -6,7 +6,7 @@ AC_DEFUN([DOVECOT_WANT_UNWIND], [
       have_libunwind=no
 
       AS_IF([test "$want_libunwind" = "yes"], [
-        AC_MSG_ERROR([cannot build with libuwind support: unwind library (libunwind-generic) not found])
+        AC_MSG_ERROR([cannot build with libunwind support: unwind library (libunwind-generic) not found])
       ])
     ])
   ])

From 357cdcea01df079e5e000f59b5c94946d8653c8c Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:32:06 -0500
Subject: [PATCH 35/35] spelling: with

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 src/lib-language/lang-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-language/lang-settings.c b/src/lib-language/lang-settings.c
index 0d21f24e3df..c5d454d2845 100644
--- a/src/lib-language/lang-settings.c
+++ b/src/lib-language/lang-settings.c
@@ -124,7 +124,7 @@ static bool langs_settings_ext_check(struct event *event, void *_set,
 
 			if (lang_default != NULL) {
 				*error_r = t_strdup_printf(
-					"Only one language with with { default = yes } is allowed"
+					"Only one language with { default = yes } is allowed"
 					" (default is '%s', cannot set '%s' too)",
 					lang_default, lang_set->name);
 				settings_free(lang_set);