* docs/grub.texi (serial): Remove obsolete comment about GRUB

needing to be compiled with serial support.
(ls): Indicate that multiple files are accepted.
* grub-core/commands/ls.c (GRUB_MOD_INIT): Update help text to
indicate that multiple files are accepted.

diff --git a/ChangeLog b/ChangeLog
index 5cfe2fa9f33b068355e78c07b3fa6be964a0ab96..648d60f4762b842e68c3c49ba6f6a5668aeace98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-16  Colin Watson  <cjwatson@ubuntu.com>
+
+       * docs/grub.texi (serial): Remove obsolete comment about GRUB
+       needing to be compiled with serial support.
+       (ls): Indicate that multiple files are accepted.
+       * grub-core/commands/ls.c (GRUB_MOD_INIT): Update help text to
+       indicate that multiple files are accepted.
+
 2010-09-16  Colin Watson  <cjwatson@ubuntu.com>
 
        * .bzrignore: Add *.1, *.8, grub-shell, grub-shell-tester,

diff --git a/docs/grub.texi b/docs/grub.texi
index af6d42ccb4ecf8469eb6bf0bd9ed750ded2fbd83..076adfd6c5fe2ddf1c299beb4e7574058b9651c0 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2415,8 +2415,7 @@ The serial port is not used as a communication channel unless the
 @command{terminal_input} or @command{terminal_output} command is used
 (@pxref{terminal_input}, @pxref{terminal_output}).
 
-This command is only available if GRUB is compiled with serial
-support. See also @ref{Serial terminal}.
+See also @ref{Serial terminal}.
 @end deffn
 
 
@@ -2907,7 +2906,7 @@ This command is only available on x86 systems.
 @node ls
 @subsection ls
 
-@deffn Command ls [arg]
+@deffn Command ls [arg @dots{}]
 List devices or files.
 
 With no arguments, print all devices known to GRUB.

diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index 3bd6607be2cebe23b0ea64f560f9c178185b9a5b..481d17db050386432f75015e25154504da976e3b 100644 (file)
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -270,7 +270,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(ls)
 {
   cmd = grub_register_extcmd ("ls", grub_cmd_ls, 0,
-                             N_("[-l|-h|-a] [FILE]"),
+                             N_("[-l|-h|-a] [FILE ...]"),
                              N_("List devices and files."), options);
 }