summaryrefslogtreecommitdiffhomepage
path: root/libs
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-07-29 21:16:12 +0000
committerSteven Barth <steven@midlink.org>2008-07-29 21:16:12 +0000
commit8c3ee6f9b7e5ab0b4edbf4838c7c1a9ee6d7df5d (patch)
treecfc137969531140b44fe4c15ac11587fdb7f7ebd /libs
parent5b43543226fa29dc7d899e9fc82f0179aefcb56b (diff)
Added "apidocs" target to Makefile
contrib/luadoc: Added luadoc executable libs: Fixed typos in inline documentation
Diffstat (limited to 'libs')
-rw-r--r--libs/core/luasrc/util.lua2
-rw-r--r--libs/web/luasrc/dispatcher.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index bcd4ed1e0..a4ea2d29f 100644
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -320,7 +320,7 @@ end
--- Combines two or more numerically indexed tables into one.
-- @param tbl1 Table value to combine
-- @param tbl2 Table value to combine
--- @param tblN More values to combine
+-- @param ... More tables to combine
-- @return Table value containing all values of given tables
function combine(...)
local result = {}
diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 628b4e3ee..576db36b4 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -410,7 +410,7 @@ function rewrite(n, ...)
end
--- Create a function-call dispatching target.
--- @param nane Target function of local controller
+-- @param name Target function of local controller
-- @param ... Additional parameters passed to the function
function call(name, ...)
local argv = {...}
@@ -418,7 +418,7 @@ function call(name, ...)
end
--- Create a template render dispatching target.
--- @param nane Template to be rendered
+-- @param name Template to be rendered
function template(name)
require("luci.template")
return function() luci.template.render(name) end