Spelling (#4086)

[Rework] Massive spelling fix from @jsoref

9 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index 745f51900..7b99e9c7a 100644
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -19,7 +19,7 @@
  * Allowed options:
  * - symbol (string): symbol to insert (default: 'R_BAD_CHARSET')
  * - threshold (double): value that would be used as threshold in expression characters_changed / total_characters
- *   (e.g. if threshold is 0.1 than charset change should occure more often than in 10 symbols), default: 0.1
+ *   (e.g. if threshold is 0.1 than charset change should occur more often than in 10 symbols), default: 0.1
  */
 
 
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index b1439357c..01e6aa189 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -4081,21 +4081,21 @@ fuzzy_attach_controller (struct module_ctx *ctx, GHashTable *commands)
 	struct rspamd_custom_controller_command *cmd;
 
 	cmd = rspamd_mempool_alloc (fctx->fuzzy_pool, sizeof (*cmd));
-	cmd->privilleged = TRUE;
+	cmd->privileged = TRUE;
 	cmd->require_message = TRUE;
 	cmd->handler = fuzzy_add_handler;
 	cmd->ctx = ctx;
 	g_hash_table_insert (commands, "/fuzzyadd", cmd);
 
 	cmd = rspamd_mempool_alloc (fctx->fuzzy_pool, sizeof (*cmd));
-	cmd->privilleged = TRUE;
+	cmd->privileged = TRUE;
 	cmd->require_message = TRUE;
 	cmd->handler = fuzzy_delete_handler;
 	cmd->ctx = ctx;
 	g_hash_table_insert (commands, "/fuzzydel", cmd);
 
 	cmd = rspamd_mempool_alloc (fctx->fuzzy_pool, sizeof (*cmd));
-	cmd->privilleged = TRUE;
+	cmd->privileged = TRUE;
 	cmd->require_message = FALSE;
 	cmd->handler = fuzzy_deletehash_handler;
 	cmd->ctx = ctx;
diff --git a/src/plugins/lua/bayes_expiry.lua b/src/plugins/lua/bayes_expiry.lua
index 84c11644d..40e0fed9e 100644
--- a/src/plugins/lua/bayes_expiry.lua
+++ b/src/plugins/lua/bayes_expiry.lua
@@ -247,7 +247,7 @@ local expiry_script = [[
   local tokens = {}
 
   -- Tokens occurrences distribution counters
-  local occurr = {
+  local occur = {
     ham = {},
     spam = {},
     total = {}
@@ -277,7 +277,7 @@ local expiry_script = [[
 
       for k,v in pairs({['ham']=ham, ['spam']=spam, ['total']=total}) do
         if tonumber(v) > 19 then v = 20 end
-        occurr[k][v] = occurr[k][v] and occurr[k][v] + 1 or 1
+        occur[k][v] = occur[k][v] and occur[k][v] + 1 or 1
       end
     end
   end
@@ -359,33 +359,33 @@ local expiry_script = [[
 
   local occ_distr = {}
   for _,cl in pairs({'ham', 'spam', 'total'}) do
-    local occurr_key = pattern_sha1 .. '_occurrence_' .. cl
+    local occur_key = pattern_sha1 .. '_occurrence_' .. cl
 
     if cursor ~= 0 then
       local n
-      for i,v in ipairs(redis.call('HGETALL', occurr_key)) do
+      for i,v in ipairs(redis.call('HGETALL', occur_key)) do
         if i % 2 == 1 then
           n = tonumber(v)
         else
-          occurr[cl][n] = occurr[cl][n] and occurr[cl][n] + v or v
+          occur[cl][n] = occur[cl][n] and occur[cl][n] + v or v
         end
       end
 
       local str = ''
-      if occurr[cl][0] ~= nil then
-        str = '0:' .. occurr[cl][0] .. ','
+      if occur[cl][0] ~= nil then
+        str = '0:' .. occur[cl][0] .. ','
       end
-      for k,v in ipairs(occurr[cl]) do
+      for k,v in ipairs(occur[cl]) do
         if k == 20 then k = '>19' end
         str = str .. k .. ':' .. v .. ','
       end
       table.insert(occ_distr, str)
     else
-      redis.call('DEL', occurr_key)
+      redis.call('DEL', occur_key)
     end
 
-    if next(occurr[cl]) ~= nil then
-      redis.call('HMSET', occurr_key, unpack_function(hash2list(occurr[cl])))
+    if next(occur[cl]) ~= nil then
+      redis.call('HMSET', occur_key, unpack_function(hash2list(occur[cl])))
     end
   end
 
diff --git a/src/plugins/lua/bimi.lua b/src/plugins/lua/bimi.lua
index a2768ea26..16ed25c96 100644
--- a/src/plugins/lua/bimi.lua
+++ b/src/plugins/lua/bimi.lua
@@ -335,7 +335,7 @@ local function bimi_callback(task)
   -- We can either check BIMI via DNS or check Redis cache
   -- BIMI check is an external check, so we might prefer Redis to be checked
   -- first. On the other hand, DNS request is cheaper and counting low BIMI
-  -- adoptation we would need to have both Redis and DNS request to hit no
+  -- adaptation we would need to have both Redis and DNS request to hit no
   -- result. So, it might be better to check DNS first at this stage...
   check_bimi_dns(task, dmarc_domain_maybe)
 end
diff --git a/src/plugins/lua/clickhouse.lua b/src/plugins/lua/clickhouse.lua
index 00a0fc738..1236941de 100644
--- a/src/plugins/lua/clickhouse.lua
+++ b/src/plugins/lua/clickhouse.lua
@@ -41,7 +41,7 @@ local settings = {
     max_memory = 50 * 1024 * 1024, -- How many memory should be occupied before sending collection
     max_interval = 60, -- Maximum collection interval
   },
-  collect_garbage = false, -- Peform GC collection after sending the data
+  collect_garbage = false, -- Perform GC collection after sending the data
   check_timeout = 10.0, -- Periodic timeout
   timeout = 5.0,
   bayes_spam_symbols = {'BAYES_SPAM'},
diff --git a/src/plugins/lua/maillist.lua b/src/plugins/lua/maillist.lua
index a5d879d05..9d392e8ef 100644
--- a/src/plugins/lua/maillist.lua
+++ b/src/plugins/lua/maillist.lua
@@ -86,7 +86,7 @@ local function check_ml_mailman(task)
     return false
   end
 
-  -- Mailmain 3 allows to disable all List-* headers in settings, but by default it adds them.
+  -- Mailman 3 allows to disable all List-* headers in settings, but by default it adds them.
   -- In all other cases all Mailman message should have List-Id header
   if not task:has_header('List-Id') then
     return false
diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 8ae903078..b03b4a6c1 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -1305,7 +1305,7 @@ if opts and type(opts) == 'table' then
     end
   end, fun.filter(function(r) return not r['prefilter'] end, rules))
 
-  -- prefilter symbils
+  -- prefilter symbols
   fun.each(function(rule)
     rspamd_config:register_symbol({
       type = 'prefilter',
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 951e5b136..7d8a861ea 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -384,16 +384,16 @@ local function gen_rbl_callback(rule)
         end
       else
         local to_resolve
-        local orign = req
+        local origin = req
 
         if not resolve_ip then
-          orign = maybe_make_hash(req, rule)
+          origin = maybe_make_hash(req, rule)
           to_resolve = string.format('%s.%s',
-              orign,
+              origin,
               rule.rbl)
         else
           -- First, resolve origin stuff without hashing or anything
-          to_resolve = orign
+          to_resolve = origin
         end
 
         nreq = {
diff --git a/src/plugins/lua/whitelist.lua b/src/plugins/lua/whitelist.lua
index 24b154c94..a97981ab9 100644
--- a/src/plugins/lua/whitelist.lua
+++ b/src/plugins/lua/whitelist.lua
@@ -44,7 +44,7 @@ local function whitelist_cb(symbol, rule, task)
     local mult
     local how = 'wl'
 
-    -- Can be overriden
+    -- Can be overridden
     if rule.blacklist then how = 'bl' end
 
     local function parse_val(val)