diff --git a/lib/naughty/core.lua b/lib/naughty/core.lua
index d4b3d86ae..3c9d3945a 100644
--- a/lib/naughty/core.lua
+++ b/lib/naughty/core.lua
@@ -66,15 +66,6 @@ Naughty configuration - a table containing common popup settings.
 
 @field defaults Default values for the params to `notify()`.
    These can optionally be overridden by specifying a preset.
-
-@field mapping DBUS notification to preset mapping.
-   The first element is an object containing the filter If the rules in the
-   filter matches the associated preset will be applied The rules object can
-   contain: urgency, category, appname The second element is the preset
-
-@field mapping.1 low urgency
-@field mapping.2 normal urgency
-@field mapping.3 critical urgency
 --]]
 --
 naughty.config = {
diff --git a/lib/naughty/dbus.lua b/lib/naughty/dbus.lua
index cb271f92a..36f9c9274 100644
--- a/lib/naughty/dbus.lua
+++ b/lib/naughty/dbus.lua
@@ -36,12 +36,15 @@ local urgency = {
     critical = "\2"
 }
 
---- DBUS notification to preset mapping
--- The first element is an object containing the filter
--- If the rules in the filter matches the associated preset will be applied
--- The rules object can contain: urgency, category, appname
--- The second element is the preset
-
+--- DBUS notification to preset mapping.
+-- The first element is an object containing the filter.
+-- If the rules in the filter match, the associated preset will be applied.
+-- The rules object can contain the following keys: urgency, category, appname.
+-- The second element is the preset.
+-- @tfield table 1 low urgency
+-- @tfield table 2 normal urgency
+-- @tfield table 3 critical urgency
+-- @table config.mapping
 dbus.config.mapping = {
     {{urgency = urgency.low}, naughty.config.presets.low},
     {{urgency = urgency.normal}, naughty.config.presets.normal},