--- a/doc/coding_style.md	Sun Jul 25 18:58:25 2021 +0200
+++ b/doc/coding_style.md	Tue Jul 27 00:13:18 2021 +0200
@@ -767,7 +767,7 @@
 ## Static checking
 
 All code should pass [luacheck](https://github.com/mpeterv/luacheck) using
-the `.luacheckrc` provided in the Prosody repository, and using miminal
+the `.luacheckrc` provided in the Prosody repository, and using minimal
 inline exceptions.
 
 * luacheck warnings of class 211, 212, 213 (unused variable, argument or loop

--- a/net/http/parser.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/net/http/parser.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -30,7 +30,7 @@
 	if not parser_type or parser_type == "server" then client = false; else assert(parser_type == "client", "Invalid parser type"); end
 	local bodylimit = tonumber(options_cb and options_cb().body_size_limit) or 10*1024*1024;
 	-- https://stackoverflow.com/a/686243
-	-- Indiviual headers can be up to 16k? What madness?
+	-- Individual headers can be up to 16k? What madness?
 	local headlimit = tonumber(options_cb and options_cb().head_size_limit) or 10*1024;
 	local buflimit = tonumber(options_cb and options_cb().buffer_size_limit) or bodylimit * 2;
 	local buffer = dbuffer.new(buflimit);

--- a/plugins/mod_admin_adhoc.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/plugins/mod_admin_adhoc.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -142,7 +142,7 @@
 			module:log("info", "User %s has been deleted by %s", aJID, jid.bare(data.from));
 			succeeded[#succeeded+1] = aJID;
 		else
-			module:log("debug", "Tried to delete non-existant user %s", aJID);
+			module:log("debug", "Tried to delete non-existent user %s", aJID);
 			failed[#failed+1] = aJID;
 		end
 	end

--- a/plugins/mod_bosh.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/plugins/mod_bosh.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -293,7 +293,7 @@
 		end
 
 		if not prosody.hosts[to_host] then
-			log("debug", "BOSH client tried to connect to non-existant host: %s", attr.to);
+			log("debug", "BOSH client tried to connect to non-existent host: %s", attr.to);
 			report_bad_host();
 			local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
 				["xmlns:stream"] = xmlns_streams, condition = "improper-addressing" });

--- a/plugins/mod_http.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/plugins/mod_http.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -30,7 +30,7 @@
 server.set_option("body_size_limit", module:get_option_number("http_max_content_size"));
 server.set_option("buffer_size_limit", module:get_option_number("http_max_buffer_size"));
 
--- CORS settigs
+-- CORS settings
 local opt_methods = module:get_option_set("access_control_allow_methods", { "GET", "OPTIONS" });
 local opt_headers = module:get_option_set("access_control_allow_headers", { "Content-Type" });
 local opt_credentials = module:get_option_boolean("access_control_allow_credentials", false);

--- a/plugins/mod_mam/mod_mam.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/plugins/mod_mam/mod_mam.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -388,7 +388,7 @@
 	local orig_to = stanza.attr.to or orig_from;
 	-- Stanza without 'to' are treated as if it was to their own bare jid
 
-	-- Whos storage do we put it in?
+	-- Whose storage do we put it in?
 	local store_user = c2s and origin.username or jid_split(orig_to);
 	-- And who are they chatting with?
 	local with = jid_bare(c2s and orig_to or orig_from);

--- a/plugins/mod_tls.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/plugins/mod_tls.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -134,7 +134,7 @@
 	return true;
 end);
 
--- Advertize stream feature
+-- Advertise stream feature
 module:hook("stream-features", function(event)
 	local origin, features = event.origin, event.features;
 	if can_do_tls(origin) then

--- a/spec/scansion/mam_prefs_prep.scs	Sun Jul 25 18:58:25 2021 +0200
+++ b/spec/scansion/mam_prefs_prep.scs	Tue Jul 27 00:13:18 2021 +0200
@@ -1,4 +1,4 @@
-# mod_mam shold apply JIDprep in prefs
+# mod_mam should apply JIDprep in prefs
 
 [Client] Romeo
 	jid: romeo@localhost

--- a/spec/util_promise_spec.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/spec/util_promise_spec.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -17,7 +17,7 @@
 		p:next(cb);
 		assert.spy(cb).was_called(1);
 	end);
-	it("notifies on fulfilment of pending promises", function ()
+	it("notifies on fulfillment of pending promises", function ()
 		local r;
 		local p = promise.new(function (resolve)
 			r = resolve;

--- a/util/sasl.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/util/sasl.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -27,7 +27,7 @@
 
 state = false : disabled
 state = true : enabled
-state = nil : non-existant
+state = nil : non-existent
 
 Channel Binding:
 

--- a/util/vcard.lua	Sun Jul 25 18:58:25 2021 +0200
+++ b/util/vcard.lua	Tue Jul 27 00:13:18 2021 +0200
@@ -29,7 +29,7 @@
 		["\\n"] = "\n",
 		["\\r"] = "\r",
 		["\\t"] = "\t",
-		["\\:"] = ":", -- FIXME Shouldn't need to espace : in values, just params
+		["\\:"] = ":", -- FIXME Shouldn't need to escape : in values, just params
 		["\\;"] = ";",
 		["\\,"] = ",",
 		[":"] = "\29",