From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MGhwC-0003y5-2R for mharc-grub-devel@gnu.org; Tue, 16 Jun 2009 19:19:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGhwA-0003tR-0B for grub-devel@gnu.org; Tue, 16 Jun 2009 19:19:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGhw5-0003hm-HO for grub-devel@gnu.org; Tue, 16 Jun 2009 19:19:29 -0400 Received: from [199.232.76.173] (port=47314 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGhw5-0003hF-41 for grub-devel@gnu.org; Tue, 16 Jun 2009 19:19:25 -0400 Received: from smarthost03.mail.zen.net.uk ([212.23.3.142]:55563) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MGhw4-0003WH-NW for grub-devel@gnu.org; Tue, 16 Jun 2009 19:19:24 -0400 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost03.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1MGhvz-0007ob-VA for grub-devel@gnu.org; Tue, 16 Jun 2009 23:19:23 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1MGhvp-0002N4-00; Wed, 17 Jun 2009 00:19:09 +0100 Date: Wed, 17 Jun 2009 00:19:09 +0100 From: Colin Watson To: grub-devel@gnu.org Message-ID: <20090616231908.GU7367@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost03-IP: [82.69.40.219] X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Fix up grub-mkimage help2man output X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 23:19:30 -0000 grub-mkimage's help2man output is messed up for a couple of targets; option lines in help text need to start with two spaces for help2man to recognise them as options rather than as flowing text. Most of GRUB gets this right, but a few places don't. Index: ChangeLog =================================================================== --- ChangeLog (revision 2334) +++ ChangeLog (working copy) @@ -1,3 +1,9 @@ +2009-06-17 Colin Watson + + * 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 * kern/i386/halt.c: Include grub/machine/init.h. Index: util/elf/grub-mkimage.c =================================================================== --- util/elf/grub-mkimage.c (revision 2334) +++ util/elf/grub-mkimage.c (working copy) @@ -332,14 +332,14 @@ \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); Index: util/i386/efi/grub-mkimage.c =================================================================== --- util/i386/efi/grub-mkimage.c (revision 2334) +++ util/i386/efi/grub-mkimage.c (working copy) @@ -1069,12 +1069,12 @@ \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); Thanks, -- Colin Watson [cjwatson@ubuntu.com]