From: carles <carles@pinux>
Date: Fri, 25 Dec 2009 23:50:59 +0000 (+0100)
Subject: 2009-12-26  Carles Pina i Estany  <carles@pina.cat>
X-Git-Tag: 1.98~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdcdbb6633160bffffd65679dd7dbf2f19ff8e91;p=thirdparty%2Fgrub.git

2009-12-26  Carles Pina i Estany  <carles@pina.cat>

	* commands/help.c (grub_cmd_help): Print the command name before the
	summary.
	(GRUB_MOD_INIT): Remove command name from the summary.
	* kern/command.c (GRUB_MOD_INIT): If summary is null assign an empty
	strig as summary.
	* lib/arg.c (find_long): Print the command name before the summary.
	* commands/acpi.c (GRUB_MOD_INIT): Remove command name from the
	summary.
	* commands/blocklist.c (GRUB_MOD_INIT): Likewise.
	* commands/cat.c (GRUB_MOD_INIT): Likewise.
	* commands/cmp.c (GRUB_MOD_INIT): Likewise.
	* commands/configfile.c (GRUB_MOD_INIT): Likewise.
	* commands/crc.c (GRUB_MOD_INIT): Likewise.
	* commands/date.c (GRUB_MOD_INIT): Likewise.
	* commands/echo.c (GRUB_MOD_INIT): Likewise.
	* commands/efi/loadbios.c (GRUB_MOD_INIT): Likewise.
	* commands/gptsync.c (GRUB_MOD_INIT): Likewise.
	* commands/handler.c (GRUB_MOD_INIT): Likewise.
	* commands/hdparm.c (GRUB_MOD_INIT): Likewise.
	* commands/hexdump.c (GRUB_MOD_INIT): Likewise.
	* commands/i386/cpuid.c (GRUB_MOD_INIT): Likewise.
	* commands/i386/pc/halt.c (GRUB_MOD_INIT): Likewise.
	* commands/i386/pc/play.c (GRUB_MOD_INIT): Likewise.
	* commands/i386/pc/pxecmd.c (GRUB_MOD_INIT): Likewise.
	* commands/keystatus.c (GRUB_MOD_INIT): Likewise.
	* commands/loadenv.c (GRUB_MOD_INIT): Likewise.
	* commands/ls.c (GRUB_MOD_INIT): Likewise.
	* commands/lspci.c (GRUB_MOD_INIT): Likewise.
	* commands/memrw.c (GRUB_MOD_INIT): Likewise.
	* commands/minicmd.c (GRUB_MOD_INIT): Likewise.
	* commands/parttool.c (GRUB_MOD_INIT): Likewise.
	* commands/password.c (GRUB_MOD_INIT): Likewise.
	* commands/probe.c (GRUB_MOD_INIT): Likewise.
	* commands/read.c (GRUB_MOD_INIT): Likewise.
	* commands/search.c (GRUB_MOD_INIT): Likewise.
	* commands/sleep.c (GRUB_MOD_INIT): Likewise.
	* commands/test.c (GRUB_MOD_INIT): Likewise.
	* commands/xnu_uuid.c (GRUB_MOD_INIT): Likewise.
	* efiemu/main.c (GRUB_MOD_INIT): Likewise.
	* font/font_cmd.c (GRUB_MOD_INIT): Likewise.
	* gettext/gettext.c (GRUB_MOD_INIT): Likewise.
	* kern/corecmd.c (GRUB_MOD_INIT): Likewise.
	* lib/arg.c (GRUB_MOD_INIT): Likewise.
	* loader/efi/appleloader.c (GRUB_MOD_INIT): Likewise.
	* loader/i386/bsd.c (GRUB_MOD_INIT): Likewise.
	* loader/xnu.c (GRUB_MOD_INIT): Likewise.
	* mmap/mmap.c (GRUB_MOD_INIT): Likewise.
	* term/terminfo.c (GRUB_MOD_INIT): Likewise.
	* video/readers/jpeg.c (GRUB_MOD_INIT): Likewise.
	* video/readers/png.c (GRUB_MOD_INIT): Likewise.
	* video/readers/tga.c (GRUB_MOD_INIT): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index c10251569..82b2ab6ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2009-12-26  Carles Pina i Estany  <carles@pina.cat>
+
+	* commands/help.c (grub_cmd_help): Print the command name before the
+	summary.
+	(GRUB_MOD_INIT): Remove command name from the summary.
+	* kern/command.c (GRUB_MOD_INIT): If summary is null assign an empty
+	strig as summary.
+	* lib/arg.c (find_long): Print the command name before the summary.
+	* commands/acpi.c (GRUB_MOD_INIT): Remove command name from the
+	summary.
+	* commands/blocklist.c (GRUB_MOD_INIT): Likewise.
+	* commands/cat.c (GRUB_MOD_INIT): Likewise.
+	* commands/cmp.c (GRUB_MOD_INIT): Likewise.
+	* commands/configfile.c (GRUB_MOD_INIT): Likewise.
+	* commands/crc.c (GRUB_MOD_INIT): Likewise.
+	* commands/date.c (GRUB_MOD_INIT): Likewise.
+	* commands/echo.c (GRUB_MOD_INIT): Likewise.
+	* commands/efi/loadbios.c (GRUB_MOD_INIT): Likewise.
+	* commands/gptsync.c (GRUB_MOD_INIT): Likewise.
+	* commands/handler.c (GRUB_MOD_INIT): Likewise.
+	* commands/hdparm.c (GRUB_MOD_INIT): Likewise.
+	* commands/hexdump.c (GRUB_MOD_INIT): Likewise.
+	* commands/i386/cpuid.c (GRUB_MOD_INIT): Likewise.
+	* commands/i386/pc/halt.c (GRUB_MOD_INIT): Likewise.
+	* commands/i386/pc/play.c (GRUB_MOD_INIT): Likewise.
+	* commands/i386/pc/pxecmd.c (GRUB_MOD_INIT): Likewise.
+	* commands/keystatus.c (GRUB_MOD_INIT): Likewise.
+	* commands/loadenv.c (GRUB_MOD_INIT): Likewise.
+	* commands/ls.c (GRUB_MOD_INIT): Likewise.
+	* commands/lspci.c (GRUB_MOD_INIT): Likewise.
+	* commands/memrw.c (GRUB_MOD_INIT): Likewise.
+	* commands/minicmd.c (GRUB_MOD_INIT): Likewise.
+	* commands/parttool.c (GRUB_MOD_INIT): Likewise.
+	* commands/password.c (GRUB_MOD_INIT): Likewise.
+	* commands/probe.c (GRUB_MOD_INIT): Likewise.
+	* commands/read.c (GRUB_MOD_INIT): Likewise.
+	* commands/search.c (GRUB_MOD_INIT): Likewise.
+	* commands/sleep.c (GRUB_MOD_INIT): Likewise.
+	* commands/test.c (GRUB_MOD_INIT): Likewise.
+	* commands/xnu_uuid.c (GRUB_MOD_INIT): Likewise.
+	* efiemu/main.c (GRUB_MOD_INIT): Likewise.
+	* font/font_cmd.c (GRUB_MOD_INIT): Likewise.
+	* gettext/gettext.c (GRUB_MOD_INIT): Likewise.
+	* kern/corecmd.c (GRUB_MOD_INIT): Likewise.
+	* lib/arg.c (GRUB_MOD_INIT): Likewise.
+	* loader/efi/appleloader.c (GRUB_MOD_INIT): Likewise.
+	* loader/i386/bsd.c (GRUB_MOD_INIT): Likewise.
+	* loader/xnu.c (GRUB_MOD_INIT): Likewise.
+	* mmap/mmap.c (GRUB_MOD_INIT): Likewise.
+	* term/terminfo.c (GRUB_MOD_INIT): Likewise.
+	* video/readers/jpeg.c (GRUB_MOD_INIT): Likewise.
+	* video/readers/png.c (GRUB_MOD_INIT): Likewise.
+	* video/readers/tga.c (GRUB_MOD_INIT): Likewise.
+
 2009-12-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use search command for preliminar UUID search.
diff --git a/commands/acpi.c b/commands/acpi.c
index 6bf9f696b..ce4e2db36 100644
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -759,7 +759,7 @@ GRUB_MOD_INIT(acpi)
 {
   cmd = grub_register_extcmd ("acpi", grub_cmd_acpi,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      "acpi [-1|-2] [--exclude=table1,table2|"
+			      "[-1|-2] [--exclude=table1,table2|"
 			      "--load-only=table1,table2] filename1 "
 			      " [filename2] [...]",
 			      "Load host acpi tables and tables "
diff --git a/commands/blocklist.c b/commands/blocklist.c
index 51a91e2d7..3c9ef3a58 100644
--- a/commands/blocklist.c
+++ b/commands/blocklist.c
@@ -110,7 +110,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(blocklist)
 {
   cmd = grub_register_command ("blocklist", grub_cmd_blocklist,
-			       "blocklist FILE", "Print a block list.");
+			       "FILE", "Print a block list.");
 }
 
 GRUB_MOD_FINI(blocklist)
diff --git a/commands/cat.c b/commands/cat.c
index 1a2374360..9d0373b3a 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -78,7 +78,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(cat)
 {
   cmd = grub_register_command_p1 ("cat", grub_cmd_cat,
-				  "cat FILE", "Show the contents of a file.");
+				  "FILE", "Show the contents of a file.");
 }
 
 GRUB_MOD_FINI(cat)
diff --git a/commands/cmp.c b/commands/cmp.c
index 8a4b4158b..bdd8ff82d 100644
--- a/commands/cmp.c
+++ b/commands/cmp.c
@@ -109,7 +109,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(cmp)
 {
   cmd = grub_register_command ("cmp", grub_cmd_cmp,
-			       "cmp FILE1 FILE2", "Compare two files.");
+			       "FILE1 FILE2", "Compare two files.");
 }
 
 GRUB_MOD_FINI(cmp)
diff --git a/commands/configfile.c b/commands/configfile.c
index 852932216..d1fe9169e 100644
--- a/commands/configfile.c
+++ b/commands/configfile.c
@@ -53,15 +53,15 @@ GRUB_MOD_INIT(configfile)
 {
   cmd_configfile =
     grub_register_command ("configfile", grub_cmd_source,
-			   "configfile FILE", "Load another config file.");
+			   "FILE", "Load another config file.");
   cmd_source =
     grub_register_command ("source", grub_cmd_source,
-			   "source FILE",
+			   "FILE",
 			   "Load another config file without changing context."
 			   );
   cmd_dot =
     grub_register_command (".", grub_cmd_source,
-			   ". FILE",
+			   "FILE",
 			   "Load another config file without changing context."
 			   );
 }
diff --git a/commands/crc.c b/commands/crc.c
index 6b4b1d1b5..a6c17caf0 100644
--- a/commands/crc.c
+++ b/commands/crc.c
@@ -57,7 +57,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(crc)
 {
   cmd = grub_register_command ("crc", grub_cmd_crc,
-			       "crc FILE",
+			       "FILE",
 			       "Calculate the crc32 checksum of a file.");
 }
 
diff --git a/commands/date.c b/commands/date.c
index 1d609642e..7197b066e 100644
--- a/commands/date.c
+++ b/commands/date.c
@@ -135,7 +135,7 @@ GRUB_MOD_INIT(date)
 {
   cmd =
     grub_register_command ("date", grub_cmd_date,
-			   "date [[year-]month-day] [hour:minute[:second]]",
+			   "[[year-]month-day] [hour:minute[:second]]",
 			   "Command to display/set current datetime.");
 }
 
diff --git a/commands/echo.c b/commands/echo.c
index c9daf62f1..4d5a59df3 100644
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -113,7 +113,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(echo)
 {
   cmd = grub_register_extcmd ("echo", grub_cmd_echo, GRUB_COMMAND_FLAG_BOTH,
-			      "echo [-e|-n] STRING", "Display a line of text.",
+			      "[-e|-n] STRING", "Display a line of text.",
 			      options);
 }
 
diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index 877b5da17..de975c724 100644
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -204,7 +204,7 @@ GRUB_MOD_INIT(loadbios)
 					0, "Fake bios.");
 
   cmd_loadbios = grub_register_command ("loadbios", grub_cmd_loadbios,
-					"loadbios BIOS_DUMP [INT10_DUMP]",
+					"BIOS_DUMP [INT10_DUMP]",
 					"Load bios dump.");
 }
 
diff --git a/commands/gptsync.c b/commands/gptsync.c
index 8315faa53..b5fe0b8ed 100644
--- a/commands/gptsync.c
+++ b/commands/gptsync.c
@@ -240,7 +240,7 @@ GRUB_MOD_INIT(gptsync)
 {
   (void) mod;			/* To stop warning. */
   cmd = grub_register_command ("gptsync", grub_cmd_gptsync,
-			       "gptsync DEVICE [PARTITION[+/-[TYPE]]] ...",
+			       "DEVICE [PARTITION[+/-[TYPE]]] ...",
 			       "Fill hybrid MBR of GPT drive DEVICE. "
 			       "specified partitions will be a part "
 			       "of hybrid mbr. Up to 3 partitions are "
diff --git a/commands/handler.c b/commands/handler.c
index d65a703e4..09b8ff5d0 100644
--- a/commands/handler.c
+++ b/commands/handler.c
@@ -95,15 +95,15 @@ GRUB_MOD_INIT(handler)
 {
   cmd_handler =
     grub_register_command ("handler", grub_cmd_handler,
-			   "handler [class [handler]]",
+			   "[class [handler]]",
 			   "List or select a handler.");
   cmd_terminal_input =
     grub_register_command ("terminal_input", grub_cmd_handler,
-			   "terminal_input [handler]",
+			   "[handler]",
 			   "List or select an input terminal.");
   cmd_terminal_output =
     grub_register_command ("terminal_output", grub_cmd_handler,
-			   "terminal_output [handler]",
+			   "[handler]",
 			   "List or select an output terminal.");
 }
 
diff --git a/commands/hdparm.c b/commands/hdparm.c
index 458a447c7..fbcd7f6a8 100644
--- a/commands/hdparm.c
+++ b/commands/hdparm.c
@@ -410,7 +410,7 @@ GRUB_MOD_INIT(hdparm)
 {
   cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      "hdparm [OPTIONS] DISK",
+			      "[OPTIONS] DISK",
 			      "Get/set ATA disk parameters.", options);
 }
 
diff --git a/commands/help.c b/commands/help.c
index c24540cef..9f0ee7528 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -67,7 +67,7 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	      if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
 		grub_arg_show_help ((grub_extcmd_t) cmd->data);
 	      else
-		grub_printf ("%s %s\n%s\b", _("Usage:"), _(cmd->summary),
+		grub_printf ("%s %s %s\n%s\b", _("Usage:"), cmd->name, _(cmd->summary),
 			     _(cmd->description));
 	    }
 	}
@@ -96,7 +96,7 @@ GRUB_MOD_INIT(help)
 {
   cmd = grub_register_extcmd ("help", grub_cmd_help,
 			      GRUB_COMMAND_FLAG_CMDLINE,
-			      N_("help [PATTERN ...]"),
+			      N_("[PATTERN ...]"),
 			      N_("Show a help message."), 0);
 }
 
diff --git a/commands/hexdump.c b/commands/hexdump.c
index 727deecbf..771cde34d 100644
--- a/commands/hexdump.c
+++ b/commands/hexdump.c
@@ -121,7 +121,7 @@ GRUB_MOD_INIT (hexdump)
 {
   cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      "hexdump [OPTIONS] FILE_OR_DEVICE",
+			      "[OPTIONS] FILE_OR_DEVICE",
 			      "Dump the contents of a file or memory.",
 			      options);
 }
diff --git a/commands/i386/cpuid.c b/commands/i386/cpuid.c
index 8097e7372..b1752ca89 100644
--- a/commands/i386/cpuid.c
+++ b/commands/i386/cpuid.c
@@ -88,7 +88,7 @@ done:
 #endif
 
   cmd = grub_register_extcmd ("cpuid", grub_cmd_cpuid, GRUB_COMMAND_FLAG_BOTH,
-			      "cpuid [-l]", "Check for CPU features.", options);
+			      "[-l]", "Check for CPU features.", options);
 }
 
 GRUB_MOD_FINI(cpuid)
diff --git a/commands/i386/pc/halt.c b/commands/i386/pc/halt.c
index befd58804..c2e22882f 100644
--- a/commands/i386/pc/halt.c
+++ b/commands/i386/pc/halt.c
@@ -46,7 +46,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(halt)
 {
   cmd = grub_register_extcmd ("halt", grub_cmd_halt, GRUB_COMMAND_FLAG_BOTH,
-			      "halt [-n]",
+			      "[-n]",
 			      "Halt the system, if possible using APM.",
 			      options);
 }
diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c
index 86c0674a4..96d9f6df5 100644
--- a/commands/i386/pc/play.c
+++ b/commands/i386/pc/play.c
@@ -208,7 +208,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(play)
 {
   cmd = grub_register_command ("play", grub_cmd_play,
-			       N_("play FILE"), N_("Play a tune."));
+			       N_("FILE"), N_("Play a tune."));
 }
 
 GRUB_MOD_FINI(play)
diff --git a/commands/i386/pc/pxecmd.c b/commands/i386/pc/pxecmd.c
index b2c99c4e2..1d4fb6a4d 100644
--- a/commands/i386/pc/pxecmd.c
+++ b/commands/i386/pc/pxecmd.c
@@ -41,7 +41,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(pxecmd)
 {
   cmd = grub_register_command ("pxe_unload", grub_cmd_pxe_unload,
-			       "pxe_unload",
+			       0,
 			       "Unload PXE environment.");
 }
 
diff --git a/commands/keystatus.c b/commands/keystatus.c
index 0a4667645..4f82550be 100644
--- a/commands/keystatus.c
+++ b/commands/keystatus.c
@@ -70,7 +70,7 @@ GRUB_MOD_INIT(keystatus)
 {
   cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      "keystatus [--shift] [--ctrl] [--alt]",
+			      "[--shift] [--ctrl] [--alt]",
 			      "Check key modifier status.",
 			      options);
 }
diff --git a/commands/loadenv.c b/commands/loadenv.c
index ac5064df9..6ee4d204a 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -396,7 +396,7 @@ GRUB_MOD_INIT(loadenv)
   cmd_save =
     grub_register_extcmd ("save_env", grub_cmd_save_env,
 			  GRUB_COMMAND_FLAG_BOTH,
-			  "save_env [-f FILE] variable_name [...]",
+			  "[-f FILE] variable_name [...]",
 			  "Save variables to environment block file.",
 			  options);
 }
diff --git a/commands/ls.c b/commands/ls.c
index 6eaa1d59e..4b1500398 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -260,7 +260,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(ls)
 {
   cmd = grub_register_extcmd ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH,
-			      "ls [-l|-h|-a] [FILE]",
+			      "[-l|-h|-a] [FILE]",
 			      "List devices and files.", options);
 }
 
diff --git a/commands/lspci.c b/commands/lspci.c
index fbade98c1..63e60abe0 100644
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -218,7 +218,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(lspci)
 {
   cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, GRUB_COMMAND_FLAG_BOTH,
-			      "lspci [-i]", "List PCI devices.", options);
+			      "[-i]", "List PCI devices.", options);
 }
 
 GRUB_MOD_FINI(lspci)
diff --git a/commands/memrw.c b/commands/memrw.c
index de3ac38e1..8e9c3db11 100644
--- a/commands/memrw.c
+++ b/commands/memrw.c
@@ -119,22 +119,22 @@ GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
     grub_register_extcmd ("read_byte", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-			  "read_byte ADDR", "Read byte from ADDR.", options);
+			  "ADDR", "Read byte from ADDR.", options);
   cmd_read_word =
     grub_register_extcmd ("read_word", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-			  "read_word ADDR", "Read word from ADDR.", options);
+			  "ADDR", "Read word from ADDR.", options);
   cmd_read_dword =
     grub_register_extcmd ("read_dword", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-			  "read_dword ADDR", "Read dword from ADDR.", options);
+			  "ADDR", "Read dword from ADDR.", options);
   cmd_write_byte =
     grub_register_command ("write_byte", grub_cmd_write,
-			   "write_byte ADDR VALUE [MASK]", "Write byte VALUE to ADDR.");
+			   "ADDR VALUE [MASK]", "Write byte VALUE to ADDR.");
   cmd_write_word =
     grub_register_command ("write_word", grub_cmd_write,
-			   "write_word ADDR VALUE [MASK]", "Write word VALUE to ADDR.");
+			   "ADDR VALUE [MASK]", "Write word VALUE to ADDR.");
   cmd_write_dword =
     grub_register_command ("write_dword", grub_cmd_write,
-			   "write_dword ADDR VALUE [MASK]", "Write dword VALUE to ADDR.");
+			   "ADDR VALUE [MASK]", "Write dword VALUE to ADDR.");
 }
 
 GRUB_MOD_FINI(memrw)
diff --git a/commands/minicmd.c b/commands/minicmd.c
index 9e06fa5de..47b57e3ed 100644
--- a/commands/minicmd.c
+++ b/commands/minicmd.c
@@ -354,19 +354,19 @@ GRUB_MOD_INIT(minicmd)
 {
   cmd_cat =
     grub_register_command ("cat", grub_mini_cmd_cat,
-			   "cat FILE", "Show the contents of a file.");
+			   "FILE", "Show the contents of a file.");
   cmd_help =
     grub_register_command ("help", grub_mini_cmd_help,
 			   0, "Show this message.");
   cmd_root =
     grub_register_command ("root", grub_mini_cmd_root,
-			   "root [DEVICE]", "Set the root device.");
+			   "[DEVICE]", "Set the root device.");
   cmd_dump =
     grub_register_command ("dump", grub_mini_cmd_dump,
-			   "dump ADDR", "Dump memory.");
+			   "ADDR", "Dump memory.");
   cmd_rmmod =
     grub_register_command ("rmmod", grub_mini_cmd_rmmod,
-			   "rmmod MODULE", "Remove a module.");
+			   "MODULE", "Remove a module.");
   cmd_lsmod =
     grub_register_command ("lsmod", grub_mini_cmd_lsmod,
 			   0, "Show loaded modules.");
diff --git a/commands/parttool.c b/commands/parttool.c
index 473652cec..62fe5ad2b 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -322,7 +322,7 @@ GRUB_MOD_INIT(parttool)
 {
   mymod = mod;
   cmd = grub_register_command ("parttool", grub_cmd_parttool,
-			       "parttool PARTITION COMMANDS",
+			       "PARTITION COMMANDS",
 			       helpmsg);
 }
 
diff --git a/commands/password.c b/commands/password.c
index 710283b3d..d9b31f962 100644
--- a/commands/password.c
+++ b/commands/password.c
@@ -75,7 +75,7 @@ GRUB_MOD_INIT(password)
 {
   my_mod = mod;
   cmd = grub_register_command ("password", grub_cmd_password,
-			       "password USER PASSWORD",
+			       "USER PASSWORD",
 			       "Set user password (plaintext). "
 			       "Unrecommended and insecure.");
 }
diff --git a/commands/probe.c b/commands/probe.c
index fb196275f..7de1c1d34 100644
--- a/commands/probe.c
+++ b/commands/probe.c
@@ -150,7 +150,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT (probe)
 {
   cmd = grub_register_extcmd ("probe", grub_cmd_probe, GRUB_COMMAND_FLAG_BOTH,
-			      "probe [DEVICE]",
+			      "[DEVICE]",
 			      "Retrieve device info.", options);
 }
 
diff --git a/commands/read.c b/commands/read.c
index 270b7bd77..5f4451a72 100644
--- a/commands/read.c
+++ b/commands/read.c
@@ -79,7 +79,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(read)
 {
   cmd = grub_register_command ("read", grub_cmd_read,
-			       "read [ENVVAR]",
+			       "[ENVVAR]",
 			       "Set variable with user input.");
 }
 
diff --git a/commands/search.c b/commands/search.c
index 33102da89..01e83739b 100644
--- a/commands/search.c
+++ b/commands/search.c
@@ -165,7 +165,7 @@ GRUB_MOD_INIT(search_fs_label)
 {
   cmd =
     grub_register_command (COMMAND_NAME, grub_cmd_do_search,
-			   COMMAND_NAME " NAME [VARIABLE]",
+			   "NAME [VARIABLE]",
 			   "Search devices by " SEARCH_TARGET "."
 			   " If VARIABLE is specified, "
 			   "the first device found is set to a variable.");
diff --git a/commands/sleep.c b/commands/sleep.c
index 9207b60a7..eb9aeb510 100644
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -105,7 +105,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(sleep)
 {
   cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, GRUB_COMMAND_FLAG_BOTH,
-			      "sleep NUMBER_OF_SECONDS",
+			      "NUMBER_OF_SECONDS",
 			      "Wait for a specified number of seconds.",
 			      options);
 }
diff --git a/commands/test.c b/commands/test.c
index 84b4279ea..8d1e24859 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -420,9 +420,9 @@ static grub_command_t cmd_1, cmd_2;
 GRUB_MOD_INIT(test)
 {
   cmd_1 = grub_register_command ("[", grub_cmd_test,
-				 "[ EXPRESSION ]", "Evaluate an expression.");
+				 "EXPRESSION ]", "Evaluate an expression.");
   cmd_2 = grub_register_command ("test", grub_cmd_test,
-				 "test EXPRESSION", "Evaluate an expression.");
+				 "EXPRESSION", "Evaluate an expression.");
 }
 
 GRUB_MOD_FINI(test)
diff --git a/commands/xnu_uuid.c b/commands/xnu_uuid.c
index 85c0e9ce4..31e69ad13 100644
--- a/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@ -377,7 +377,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT (xnu_uuid)
 {
   cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid,
-			       "xnu_uuid GRUBUUID [VARNAME]",
+			       "GRUBUUID [VARNAME]",
 			       "Transform 64-bit UUID to format "
 			       "suitable for xnu.");
 }
diff --git a/efiemu/main.c b/efiemu/main.c
index f6d7b2e4c..3ec707ef3 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -328,14 +328,14 @@ GRUB_MOD_INIT(efiemu)
 {
   cmd_loadcore = grub_register_command ("efiemu_loadcore",
 					grub_cmd_efiemu_load,
-				       "efiemu_loadcore FILE",
+				       "FILE",
 				       "Load and initialize EFI emulator");
   cmd_prepare = grub_register_command ("efiemu_prepare",
 				       grub_cmd_efiemu_prepare,
-				       "efiemu_prepare",
+				       0,
 				       "Finalize loading of EFI emulator");
   cmd_unload = grub_register_command ("efiemu_unload", grub_cmd_efiemu_unload,
-				      "efiemu_unload",
+				      0,
 				      "Unload  EFI emulator");
 }
 
diff --git a/font/font_cmd.c b/font/font_cmd.c
index 0402b8d77..98216ae44 100644
--- a/font/font_cmd.c
+++ b/font/font_cmd.c
@@ -62,7 +62,7 @@ GRUB_MOD_INIT(font_manager)
 
   cmd_loadfont =
     grub_register_command ("loadfont", loadfont_command,
-			 "loadfont FILE...",
+			 "FILE...",
 			 "Specify one or more font files to load.");
   cmd_lsfonts =
     grub_register_command ("lsfonts", lsfonts_command,
diff --git a/gettext/gettext.c b/gettext/gettext.c
index c48b5fd95..3472b2fb8 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -347,7 +347,7 @@ GRUB_MOD_INIT (gettext)
   grub_gettext_init_ext (lang);
 
   grub_register_command_p1 ("gettext", grub_cmd_translate,
-			    "gettext STRING",
+			    "STRING",
 			    "Translates the string with the current settings.");
 
   /* Reload .mo file information if lang changes.  */
diff --git a/kern/command.c b/kern/command.c
index 9b3c92b9b..477240d57 100644
--- a/kern/command.c
+++ b/kern/command.c
@@ -37,7 +37,7 @@ grub_register_command_prio (const char *name,
 
   cmd->name = name;
   cmd->func = func;
-  cmd->summary = (summary) ? summary : name;
+  cmd->summary = (summary) ? summary : "";
   cmd->description = description;
 
   cmd->flags = GRUB_COMMAND_FLAG_BOTH;
diff --git a/kern/corecmd.c b/kern/corecmd.c
index 03944f2df..5ea052d38 100644
--- a/kern/corecmd.c
+++ b/kern/corecmd.c
@@ -190,13 +190,13 @@ void
 grub_register_core_commands (void)
 {
   grub_register_command ("set", grub_core_cmd_set,
-			 "set [ENVVAR=VALUE]", "set an environment variable");
+			 "[ENVVAR=VALUE]", "set an environment variable");
   grub_register_command ("unset", grub_core_cmd_unset,
-			 "unset ENVVAR", "remove an environment variable");
+			 "ENVVAR", "remove an environment variable");
   grub_register_command ("export", grub_core_cmd_export,
-			 "export ENVVAR", "Export a variable.");
+			 "ENVVAR", "Export a variable.");
   grub_register_command ("ls", grub_core_cmd_ls,
-			 "ls [ARG]", "list devices or files");
+			 "[ARG]", "list devices or files");
   grub_register_command ("insmod", grub_core_cmd_insmod,
-			 "insmod MODULE", "insert a module");
+			 "MODULE", "insert a module");
 }
diff --git a/lib/arg.c b/lib/arg.c
index bc1af1938..6a7bb8beb 100644
--- a/lib/arg.c
+++ b/lib/arg.c
@@ -107,7 +107,7 @@ find_long (const struct grub_arg_option *options, const char *s, int len)
 static void
 show_usage (grub_extcmd_t cmd)
 {
-  grub_printf ("%s %s\n", _("Usage:"), _(cmd->cmd->summary));
+  grub_printf ("%s %s %s\n", _("Usage:"), cmd->cmd->name, _(cmd->cmd->summary));
 }
 
 void
diff --git a/loader/efi/appleloader.c b/loader/efi/appleloader.c
index 94d501bcf..a7c2183ab 100644
--- a/loader/efi/appleloader.c
+++ b/loader/efi/appleloader.c
@@ -208,7 +208,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(appleloader)
 {
   cmd = grub_register_command ("appleloader", grub_cmd_appleloader,
-			       "appleloader [OPTS]", "Boot legacy system.");
+			       "[OPTS]", "Boot legacy system.");
   my_mod = mod;
 }
 
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 620c4bbf3..ead7ed1f8 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -1280,15 +1280,15 @@ GRUB_MOD_INIT (bsd)
 {
   cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
 				      GRUB_COMMAND_FLAG_BOTH,
-				      "kfreebsd FILE", "Load kernel of FreeBSD.",
+				      "FILE", "Load kernel of FreeBSD.",
 				      freebsd_opts);
   cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd,
 				      GRUB_COMMAND_FLAG_BOTH,
-				      "kopenbsd FILE", "Load kernel of OpenBSD.",
+				      "FILE", "Load kernel of OpenBSD.",
 				      openbsd_opts);
   cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,
 				     GRUB_COMMAND_FLAG_BOTH,
-				     "knetbsd FILE", "Load kernel of NetBSD.",
+				     "FILE", "Load kernel of NetBSD.",
 				     netbsd_opts);
   cmd_freebsd_loadenv =
     grub_register_command ("kfreebsd_loadenv", grub_cmd_freebsd_loadenv,
diff --git a/loader/xnu.c b/loader/xnu.c
index 85d2882b6..1954d4b65 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -1412,7 +1412,7 @@ GRUB_MOD_INIT(xnu)
   cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0,
 				    "Load XNU extension.");
   cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir,
-				       "xnu_kextdir DIRECTORY [OSBundleRequired]",
+				       "DIRECTORY [OSBundleRequired]",
 				       "Load XNU extension directory");
   cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0,
 				       "Load XNU ramdisk. "
diff --git a/mmap/mmap.c b/mmap/mmap.c
index 7598cf501..3dc44c24e 100644
--- a/mmap/mmap.c
+++ b/mmap/mmap.c
@@ -414,7 +414,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(mmap)
 {
   cmd = grub_register_command ("badram", grub_cmd_badram,
-			       "badram ADDR1,MASK1[,ADDR2,MASK2[,...]]",
+			       "ADDR1,MASK1[,ADDR2,MASK2[,...]]",
 			       "declare memory regions as badram");
 }
 
diff --git a/term/terminfo.c b/term/terminfo.c
index e5328d06b..fc22fe850 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -178,7 +178,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(terminfo)
 {
   cmd = grub_register_command ("terminfo", grub_cmd_terminfo,
-			       "terminfo [TERM]", "Set terminfo type.");
+			       "[TERM]", "Set terminfo type.");
   grub_terminfo_set_current ("vt100");
 }
 
diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index 460a52872..0c3d00bef 100644
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -731,7 +731,7 @@ GRUB_MOD_INIT (video_reader_jpeg)
   grub_video_bitmap_reader_register (&jpeg_reader);
 #if defined(JPEG_DEBUG)
   grub_register_command ("jpegtest", grub_cmd_jpegtest,
-			 GRUB_COMMAND_FLAG_BOTH, "jpegtest FILE",
+			 GRUB_COMMAND_FLAG_BOTH, "FILE",
 			 "Tests loading of JPEG bitmap.", 0);
 #endif
 }
diff --git a/video/readers/png.c b/video/readers/png.c
index c2008aeb2..908672a2e 100644
--- a/video/readers/png.c
+++ b/video/readers/png.c
@@ -895,7 +895,7 @@ GRUB_MOD_INIT (video_reader_png)
   grub_video_bitmap_reader_register (&png_reader);
 #if defined(PNG_DEBUG)
   grub_register_command ("pngtest", grub_cmd_pngtest,
-			 GRUB_COMMAND_FLAG_BOTH, "pngtest FILE",
+			 GRUB_COMMAND_FLAG_BOTH, "FILE",
 			 "Tests loading of PNG bitmap.", 0);
 #endif
 }
diff --git a/video/readers/tga.c b/video/readers/tga.c
index 277458fa8..c5ff99cfe 100644
--- a/video/readers/tga.c
+++ b/video/readers/tga.c
@@ -481,7 +481,7 @@ GRUB_MOD_INIT(video_reader_tga)
   grub_video_bitmap_reader_register (&tga_reader);
 #if defined(TGA_DEBUG)
   grub_register_command ("tgatest", grub_cmd_tgatest, GRUB_COMMAND_FLAG_BOTH,
-                         "tgatest FILE", "Tests loading of TGA bitmap.", 0);
+                         "FILE", "Tests loading of TGA bitmap.", 0);
 #endif
 }