Merge branch 'master' into luarocks-3

4 files changed, 19 insertions, 4 deletions

diff --git a/src/luarocks/config_cmd.lua b/src/luarocks/config_cmd.lua
index c066cfec..bf282a7a 100644
--- a/src/luarocks/config_cmd.lua
+++ b/src/luarocks/config_cmd.lua
@@ -6,6 +6,22 @@ local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 
+config_cmd.help_summary = "Query information about the LuaRocks configuration."
+config_cmd.help_arguments = "<flag>"
+config_cmd.help = [[
+--lua-incdir     Path to Lua header files.
+
+--lua-libdir     Path to Lua library files.
+
+--lua-ver        Lua version (in major.minor format). e.g. 5.1
+
+--system-config  Location of the system config file.
+
+--user-config    Location of the user config file.
+
+--rock-trees     Rocks trees in use. First the user tree, then the system tree.
+]]
+
 local function config_file(conf)
    print(dir.normalize(conf.file))
    if conf.ok then
@@ -39,7 +55,6 @@ function config_cmd.run(...)
    if flags["user-config"] then
       return config_file(conf.user)
    end
-
    if flags["rock-trees"] then
       for _, tree in ipairs(cfg.rocks_trees) do
         if type(tree) == "string" then
diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua
index 034e2a16..53ed0116 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/doc.lua
@@ -13,7 +13,7 @@ local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local download = require("luarocks.download")
 
-doc.help_summary = "Shows documentation for an installed rock."
+doc.help_summary = "Show documentation for an installed rock."
 
 doc.help = [[
 <argument> is an existing package name.
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index 518b83ce..fddded03 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -11,7 +11,7 @@ local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
-list.help_summary = "Lists currently installed rocks."
+list.help_summary = "List currently installed rocks."
 list.help_arguments = "[--porcelain] <filter>"
 list.help = [[
 <filter> is a substring of a rock name to filter by.
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 3243c0ce..08b2673f 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -11,7 +11,7 @@ local path = require("luarocks.path")
 local deps = require("luarocks.deps")
 local fetch = require("luarocks.fetch")
 local manif = require("luarocks.manif")
-show.help_summary = "Shows information about an installed rock."
+show.help_summary = "Show information about an installed rock."
 
 show.help = [[
 <argument> is an existing package name.