From f0df2d6e8fd64eb762e419fd632747eee80fee8f Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Mon, 31 Dec 2018 17:49:14 -0500 Subject: [PATCH 1/3] doc: Merge the `termite` hotkey popup doc The other components are already merged as such. --- lib/awful/hotkeys_popup/keys/termite.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/awful/hotkeys_popup/keys/termite.lua b/lib/awful/hotkeys_popup/keys/termite.lua index 639d49f1..a6514105 100644 --- a/lib/awful/hotkeys_popup/keys/termite.lua +++ b/lib/awful/hotkeys_popup/keys/termite.lua @@ -3,7 +3,7 @@ -- -- @author ikselven -- @copyright 2017 ikselven --- @module awful.hotkeys_popup.keys.termite +-- @submodule awful.hotkeys_popup --------------------------------------------------------------------------- local hotkeys_popup = require("awful.hotkeys_popup.widget") From 491a46875c66f43893d655c3cce4fbcd61d550e4 Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Mon, 31 Dec 2018 17:49:44 -0500 Subject: [PATCH 2/3] doc: Merge the beautiful documentation Given they are all small, it makes more sense to just merge them like we did for the client API For some reasons GTK doesn't want to be merged. To be investigated. --- lib/beautiful/theme_assets.lua | 2 +- lib/beautiful/xresources.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/beautiful/theme_assets.lua b/lib/beautiful/theme_assets.lua index 109e908f..081f8109 100644 --- a/lib/beautiful/theme_assets.lua +++ b/lib/beautiful/theme_assets.lua @@ -3,7 +3,7 @@ -- -- @author Yauhen Kirylau <yawghen@gmail.com> -- @copyright 2015 Yauhen Kirylau --- @module beautiful.theme_assets +-- @submodule beautiful ---------------------------------------------------------------------------- local cairo = require("lgi").cairo diff --git a/lib/beautiful/xresources.lua b/lib/beautiful/xresources.lua index 087ab3c9..5e45b4fc 100644 --- a/lib/beautiful/xresources.lua +++ b/lib/beautiful/xresources.lua @@ -3,7 +3,7 @@ -- -- @author Yauhen Kirylau <yawghen@gmail.com> -- @copyright 2015 Yauhen Kirylau --- @module beautiful.xresources +-- @submodule beautiful ---------------------------------------------------------------------------- -- Grab environment From 6ca970395cf7654b319e0a55f7b6694720b9440e Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Mon, 31 Dec 2018 17:50:37 -0500 Subject: [PATCH 3/3] doc: Merge gears.object and gears.object.properties The `properties` submodule is almost for private use anyway. It is not worth poluting the API index for it. --- lib/gears/object/properties.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/gears/object/properties.lua b/lib/gears/object/properties.lua index 36b8fcbf..3b740fd4 100644 --- a/lib/gears/object/properties.lua +++ b/lib/gears/object/properties.lua @@ -4,7 +4,7 @@ -- -- @author Emmanuel Lepage-Vallee <elv1313@gmail.com> -- @copyright 2016 Emmanuel Lepage-Vallee --- @module gears.object.properties +-- @submodule gears.object --------------------------------------------------------------------------- local object = {} @@ -26,6 +26,7 @@ local object = {} -- -- @param class A standard luaobject derived object -- @tparam[opt={}] table args A set of accessors configuration parameters +-- @function gears.object.properties.capi_index_fallback function object.capi_index_fallback(class, args) args = args or {}