From 88999a20fb382cf45025ec03c69f072d8f79c037 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 9 Apr 2009 14:38:50 +0200 Subject: [PATCH] Fix dashes of options in manpage --- debian/changelog | 7 +++++++ grml2usb | 2 +- grml2usb.8.txt | 44 ++++++++++++++++++++++---------------------- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9419886..3a0d1a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml2usb (0.9.5) UNRELEASED; urgency=low + + * Fix dashes of options in manpage (thanks for the bugreport, + Thorsten Glaser). + + -- Michael Prokop Thu, 09 Apr 2009 14:35:30 +0200 + grml2usb (0.9.4) unstable; urgency=low * Bugfix: move kernel commandline from initrd to kernel option in diff --git a/grml2usb b/grml2usb index 1cc4521..8e223a5 100755 --- a/grml2usb +++ b/grml2usb @@ -18,7 +18,7 @@ from inspect import isroutine, isclass import datetime, logging, os, re, subprocess, sys, tempfile, time # global variables -PROG_VERSION = "0.9.4" +PROG_VERSION = "0.9.5" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg diff --git a/grml2usb.8.txt b/grml2usb.8.txt index bf4bc3b..27f6542 100644 --- a/grml2usb.8.txt +++ b/grml2usb.8.txt @@ -47,41 +47,41 @@ don't need one) and a bootloader won't be installed automatically. The following options are supported: - *--bootoptions=...*:: + *\--bootoptions=...*:: Use specified bootoptions as default. - *--bootloader-only*:: + *\--bootloader-only*:: Do *not* copy files but instead just install a bootloader. Note that the boot addons are copied to /boot/addons at this stage as well. If you want to skip copying the boot addons consider using the --skip-addons option. - *--copy-only*:: + *\--copy-only*:: Copy files only but do *not* install a bootloader. - *--dry-run*:: + *\--dry-run*:: Avoid executing commands, instead show what would be executed. Warning: please notice that the ISO has to be mounted anyway, otherwise identifying the grml flavour would not be possible. - *--fat16*:: + *\--fat16*:: Format specified partition with FAT16. **Important:** this will destroy any existing data on the specified partition! - *--force*:: + *\--force*:: Force any (possible dangerous) actions requiring manual interaction (like --fat16). - *--help*:: + *\--help*:: Display usage information and exit. ////////////////////////////////////////////////////////////////////////// - *--initrd=...*:: + *\--initrd=...*:: Install specified initrd instead of the default. You might want to specify option *--kernel* as well. (Be aware when using multiboot setup.) @@ -89,14 +89,14 @@ option *--kernel* as well. (Be aware when using multiboot setup.) ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// - *--kernel=...*:: + *\--kernel=...*:: Install specified kernel instead of the default. You might want to specify option *--initrd* as well. (Be aware when using multiboot setup.) [Notice: not implemented yet.] ////////////////////////////////////////////////////////////////////////// - *--lilo-binary=...*:: + *\--lilo-binary=...*:: Use specified lilo executable for installing master boot record (MBR) when using the --syslinux-mbr option. By default any system wide (from $PATH) lilo @@ -104,7 +104,7 @@ executable is taken. If there can not be find any lilo executable the statically compiled version of the grml2usb Debian package (see /usr/share/grml2usb/lilo/lilo.static.[amd64|i386]) is taken. - *--mbr-menu*:: + *\--mbr-menu*:: Install master boot record (MBR) with integrated boot menu: interactively choose the partition to boot from, with a timeout to load the default partition, or @@ -114,23 +114,23 @@ visible at all but instead directly jumps to the bootloader - being grub or syslinux). Note: This options is available only when using the default MBR and won't have any effect if you're using the --syslinux-mbr option. - *--quiet*:: + *\--quiet*:: Do not output anything but just errors on console. - *--skip-addons*:: + *\--skip-addons*:: Do not install /boot/addons/ files (like dos, grub, memdisk,...). - *--skip-mbr*:: + *\--skip-mbr*:: Do not touch/install the master boot record (MBR). - *--syslinux*:: + *\--syslinux*:: Install syslinux bootloader instead of the default (being grub). - *--syslinux-mbr*:: + *\--syslinux-mbr*:: Install syslinux' master boot record (MBR, which is booting from the partition with the "active" flag set) instead of the default one. If you encounter any @@ -140,24 +140,24 @@ accordingly. Note: When using the --syslinux-mbr option lilo is executed before the MBR is installed so the according partitions are set active. ////////////////////////////////////////////////////////////////////////// - *--squashfs=*:: + *\--squashfs=*:: Install specified squashfs file instead of the default. [Notice: not implemented yet.] ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// - *--uninstall*:: + *\--uninstall*:: Uninstall grml ISO files. [Notice: not implemented yet.] ////////////////////////////////////////////////////////////////////////// - *-v*, *--version*:: + *-v*, *\--version*:: Return version and exit. - *--verbose*:: + *\--verbose*:: Enable verbose mode. @@ -380,7 +380,7 @@ Why do I have to use a FAT16 filesystem? You have to use a FAT16 filesystem only if you consider using syslinux, Syslinux (currently) does not support any other filesystems. If you want to use another -filesystem (like ext2/3) just don't use syslinux (drop the --syslinux option) +filesystem (like ext2/3) just don't use syslinux (drop the \--syslinux option) but use the default bootloader (grub) instead. I think I've got a really cool idea! @@ -400,7 +400,7 @@ I've found a bug! ~~~~~~~~~~~~~~~~~ Please <>. Please provide usage examples and output -of your grml2usb commandline (consider using the "--verbose" option). +of your grml2usb commandline (consider using the "\--verbose" option). Usage examples -------------- -- 2.1.4