Merge topic branch t/sf_float into pu

[paraslash.git] / m4 / lls / server_cmd.suite.m4

diff --git a/m4/lls/server_cmd.suite.m4 b/m4/lls/server_cmd.suite.m4
index f73d66b26a713ce70ed144e38362a73f5ddcf8c1..d694082beac70f0990f0356d1cc2443ca9c38657 100644 (file)
--- a/m4/lls/server_cmd.suite.m4
+++ b/m4/lls/server_cmd.suite.m4
@@ -169,6 +169,8 @@ aux_info_prefix = Permissions:
                playlists. Otherwise only the given tables are created.
        [/description]
 
+m4_include(`com_ll.m4')
+
 [subcommand jmp]
        purpose = reposition the current stream
        non-opts-name = n
@@ -214,11 +216,22 @@ aux_info_prefix = Permissions:
                        a length field.
 
                        mbox (m). Generate output suitable to be viewed with a mail
-                       program. One "mail" per matching audio file.
-
-                       chunk-table (c). Print path (or basename, depending on whether -p is
-                       also given), chunk time and chunk offsets.
+                       program. One "mail" per matching audio file. This listing mode is
+                       deprecated and will be removed after paraslash-0.8.0 has been released.
 
+                       chunk-table (c). Print path (or basename, depending on whether -p
+                       is also given), chunk time and chunk offsets. This listing mode is
+                       deprecated and will be removed after paraslash-0.8.0 has been released.
+               [/help]
+       [option limit]
+               short_opt = L
+               summary = list at most this many files
+               arg_type = uint32
+               arg_info = required_arg
+               typestr = num
+               [help]
+                       An argument of zero means "unlimited". This is also the default which
+                       applies if the option is not given.
                [/help]
        [option basename]
                short_opt = b
@@ -231,9 +244,19 @@ aux_info_prefix = Permissions:
        [option admissible]
                short_opt = a
                summary = list only admissible files
+               arg_type = string
+               arg_info = optional_arg
+               typestr = specifier/name
+               default_val = .
                [help]
-                       List only files which are admissible with respect to the current mood
-                       or playlist.
+                       If the optional argument is supplied, it must be of the form "p/foo"
+                       or "m/bar" (which refer to the playlist named "foo" and the mood named
+                       "bar", respectively). The command then restricts its output to the set
+                       of files which are admissible with respect to the thusly identified
+                       mood or playlist.
+
+                       If no argument is given, or if the argument is the special value ".",
+                       the current mood or playlist is assumed.
                [/help]
        [option reverse]
                short_opt = r
@@ -405,6 +428,9 @@ aux_info_prefix = Permissions:
 
                activates the mood named 'foo'.
        [/description]
+       [option verbose]
+               short_opt = v
+               summary = print information about the loaded mood or playlist
 
 [subcommand sender]
        purpose = control paraslash senders