summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2023-11-06 14:24:33 +0000
committerGitHub <noreply@github.com>2023-11-06 14:24:33 +0000
commit9c7a000e95753246d36b53ba723a603e52df643e (patch)
treed18529a2ce88af8d971f534cc62caf161d59d3d0
parent85a2fc689c40439e86a58cb74ab75301ae9f7881 (diff)
parentb189c9fea6334cc9211b73d76acd05e7f1f71913 (diff)
downloadrspamd-9c7a000e95753246d36b53ba723a603e52df643e.tar.gz
rspamd-9c7a000e95753246d36b53ba723a603e52df643e.zip
Merge pull request #4687 from fatalbanana/doxydown
[Minor] doxydown: fix elements containing few spaces
-rwxr-xr-xdoc/doxydown/doxydown.pl2
-rw-r--r--lualib/lua_maps.lua20
2 files changed, 11 insertions, 11 deletions
diff --git a/doc/doxydown/doxydown.pl b/doc/doxydown/doxydown.pl
index 9c2f74131..5002f589a 100755
--- a/doc/doxydown/doxydown.pl
+++ b/doc/doxydown/doxydown.pl
@@ -21,7 +21,7 @@ my %languages = (
lua => {
start => qr/^\s*\--(?:\[\[\[+|-+)\s*$/,
end => qr/^\s*--(:?\]\]+|-+)\s*$/,
- filter => qr/^(?:\s*--!?\s?)?(\s*\S.+)\s*$/,
+ filter => qr/^(?:\s*--!?\s?)?(\s*\S?.+)\s*$/,
},
sql => {
start => qr/^\s*\--(?:\[\[+|-+)\s*$/,
diff --git a/lualib/lua_maps.lua b/lualib/lua_maps.lua
index baaed5b50..1bcce6066 100644
--- a/lualib/lua_maps.lua
+++ b/lualib/lua_maps.lua
@@ -553,17 +553,17 @@ exports.rspamd_maybe_check_map = rspamd_maybe_check_map
-- @function lua_maps.fill_config_maps(mname, options, defs)
-- Fill maps that could be defined in defs, from the config in the options
-- Defs is a table indexed by a map's parameter name and defining it's config,
--- for example:
-defs = {
- my_map = {
- type = 'map',
- description = 'my cool map',
- optional = true,
- }
-}
--- Then this function will look for opts.my_map parameter and try to replace it's with
+-- @example
+-- defs = {
+-- my_map = {
+-- type = 'map',
+-- description = 'my cool map',
+-- optional = true,
+-- }
+-- }
+-- --[[ Then this function will look for opts.my_map parameter and try to replace it's with
-- a map with the specific type, description but not failing if it was empty.
--- It will also set options.my_map_orig to the original value defined in the map
+-- It will also set options.my_map_orig to the original value defined in the map --]]
--]]
exports.fill_config_maps = function(mname, opts, map_defs)
assert(type(opts) == 'table')