diff options
| -rw-r--r-- | doc/coding_style.md | 2 | ||||
| -rw-r--r-- | net/http/parser.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_admin_adhoc.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_bosh.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_http.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_tls.lua | 2 | ||||
| -rw-r--r-- | spec/scansion/mam_prefs_prep.scs | 2 | ||||
| -rw-r--r-- | spec/util_promise_spec.lua | 2 | ||||
| -rw-r--r-- | util/sasl.lua | 2 | ||||
| -rw-r--r-- | util/vcard.lua | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/doc/coding_style.md b/doc/coding_style.md index 2635fa2f..3d831e3f 100644 --- a/doc/coding_style.md +++ b/doc/coding_style.md @@ -767,7 +767,7 @@ on other resources. ## 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 diff --git a/net/http/parser.lua b/net/http/parser.lua index 96f17fdb..7fbade4c 100644 --- a/net/http/parser.lua +++ b/net/http/parser.lua @@ -30,7 +30,7 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb) 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); diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua index 0bc27e09..1471fba0 100644 --- a/plugins/mod_admin_adhoc.lua +++ b/plugins/mod_admin_adhoc.lua @@ -142,7 +142,7 @@ local delete_user_command_handler = adhoc_simple(delete_user_layout, function(fi 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 diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index b050e350..7e710760 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -293,7 +293,7 @@ function stream_callbacks.streamopened(context, attr) 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" }); diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 682d5ae3..de34cd5f 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -30,7 +30,7 @@ server.set_default_host(module:get_option_string("http_default_host")); 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); diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index bd4ba64a..1b5c926c 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -388,7 +388,7 @@ local function message_handler(event, c2s) 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); diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 39207f6f..9cd2a672 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -134,7 +134,7 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event) 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 diff --git a/spec/scansion/mam_prefs_prep.scs b/spec/scansion/mam_prefs_prep.scs index 9589ec65..1175a6de 100644 --- a/spec/scansion/mam_prefs_prep.scs +++ b/spec/scansion/mam_prefs_prep.scs @@ -1,4 +1,4 @@ -# mod_mam shold apply JIDprep in prefs +# mod_mam should apply JIDprep in prefs [Client] Romeo jid: romeo@localhost diff --git a/spec/util_promise_spec.lua b/spec/util_promise_spec.lua index 307c094a..67f33416 100644 --- a/spec/util_promise_spec.lua +++ b/spec/util_promise_spec.lua @@ -17,7 +17,7 @@ describe("util.promise", function () 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; diff --git a/util/sasl.lua b/util/sasl.lua index fc2abdf3..46e75e48 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -27,7 +27,7 @@ Authentication Backend Prototypes: state = false : disabled state = true : enabled -state = nil : non-existant +state = nil : non-existent Channel Binding: diff --git a/util/vcard.lua b/util/vcard.lua index bb299fab..e311f73f 100644 --- a/util/vcard.lua +++ b/util/vcard.lua @@ -29,7 +29,7 @@ local function vCard_unesc(s) ["\\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", |