term/terminfo: Fix the terminfo command help and documentation

Additionally, fix the terminfo spelling mistake in
the GRUB development documentation.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>

diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
index a834b3a9c32c474dc2bd36d389a3c4a6c23554ad..6c629a23e2dc175a464e1d04d5b09ae643c7b974 100644 (file)
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -820,7 +820,7 @@ Of video is loongson (kern/mips/loongson/init.c). Note that terminfo has
 to be inited in 2 stages: one before (to get at least rudimentary console
 as early as possible) and another after the heap (to get full-featured console).
 For the input there are string of keys, terminfo and direct hardware. For string
-of keys look at i386-pc (same files), for termino ieee1275 (same files) and for
+of keys look at i386-pc (same files), for terminfo ieee1275 (same files) and for
 hardware loongson (kern/mips/loongson/init.c and term/at_keyboard.c).
 
 For the timer you'll need to call grub_install_get_time_ms (...) with as sole

diff --git a/docs/grub.texi b/docs/grub.texi
index e2c58415a0cc6da91d54f1044e57d770d025b39d..f8b4b3b21a7fa6e1ac3d55afe0238709d60110b4 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -3934,7 +3934,7 @@ names active.
 @node terminfo
 @subsection terminfo
 
-@deffn Command terminfo [-a|-u|-v] [term]
+@deffn Command terminfo [@option{-a}|@option{-u}|@option{-v}] [@option{-g WxH}] [term] [type]
 Define the capabilities of your terminal by giving the name of an entry in
 the terminfo database, which should correspond roughly to a @samp{TERM}
 environment variable in Unix.
@@ -3951,6 +3951,8 @@ specifies logically-ordered UTF-8; and @option{-v} specifies
 emulator without bidirectional text support will display right-to-left text
 in the proper order; this is not really proper UTF-8, but a workaround).
 
+The @option{-g} (@option{--geometry}) can be used to specify terminal geometry.
+
 If no option or terminal type is specified, the current terminal type is
 printed.
 @end deffn

diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
index cd7200803757d74e1313eda0a70a0428afa3b96c..85ecf06b4df4cf5fa5d737d27eb971ffee4cc89e 100644 (file)
--- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c
@@ -785,8 +785,8 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(terminfo)
 {
   cmd = grub_register_extcmd ("terminfo", grub_cmd_terminfo, 0,
-                             N_("[[-a|-u|-v] [-g WxH] TERM [TYPE]]"),
-                             N_("Set terminfo type of TERM  to TYPE.\n"),
+                             N_("[[-a|-u|-v] [-g WxH] [TERM] [TYPE]]"),
+                             N_("Set terminfo type of TERM to TYPE.\n"),
                              options);
 }