2009-06-17 Colin Watson <cjwatson@ubuntu.com>

	* util/elf/grub-mkimage.c (usage): Prefix each option line with two
	spaces, for the benefit of help2man.
	* util/i386/efi/grub-mkimage.c (usage): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9430c0f041c2bf92b2955af2c7705829e683f5c6..6707e3ae9152ae8981022bda117397bcdea444a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-17  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/elf/grub-mkimage.c (usage): Prefix each option line with two
+       spaces, for the benefit of help2man.
+       * util/i386/efi/grub-mkimage.c (usage): Likewise.
+
 2009-06-16  Pavel Roskin  <proski@gnu.org>
 
        * kern/i386/halt.c: Include grub/machine/init.h.

diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index f841035c2b4a91b143ee044e6b9eaf5e04a0ff81..3ef763fcbc1d13757a0d6f8cdd156d9866a5c3a6 100644 (file)
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -332,14 +332,14 @@ Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
--d, --directory=DIR     use images and modules under DIR [default=%s]\n\
--p, --prefix=DIR        set grub_prefix directory\n\
--m, --memdisk=FILE      embed FILE as a memdisk image\n\
--o, --output=FILE       output a generated image to FILE\n\
--h, --help              display this message and exit\n\
--n, --note              add NOTE segment for CHRP Open Firmware\n\
--V, --version           print version information and exit\n\
--v, --verbose           print verbose messages\n\
+  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
+  -p, --prefix=DIR        set grub_prefix directory\n\
+  -m, --memdisk=FILE      embed FILE as a memdisk image\n\
+  -o, --output=FILE       output a generated image to FILE\n\
+  -h, --help              display this message and exit\n\
+  -n, --note              add NOTE segment for CHRP Open Firmware\n\
+  -V, --version           print version information and exit\n\
+  -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
 ", GRUB_LIBDIR, PACKAGE_BUGREPORT);

diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
index f4203b5a36e5cb3f932b1008183787d93582170a..2813e799d9db01cd494390fc73f9e5e55c9a1501 100644 (file)
--- a/util/i386/efi/grub-mkimage.c
+++ b/util/i386/efi/grub-mkimage.c
@@ -1069,12 +1069,12 @@ Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
--d, --directory=DIR     use images and modules under DIR [default=%s]\n\
--p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
--o, --output=FILE       output a generated image to FILE\n\
--h, --help              display this message and exit\n\
--V, --version           print version information and exit\n\
--v, --verbose           print verbose messages\n\
+  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
+  -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
+  -o, --output=FILE       output a generated image to FILE\n\
+  -h, --help              display this message and exit\n\
+  -V, --version           print version information and exit\n\
+  -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
 ", GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);