Merge branch 'master' of https://github.com/jimmy42/grml2usb

Makefile

@@ -20,8 +20,6 @@ man-stamp: grml2usb.8.txt grml2iso.8.txt
 	# notice: docbook-xsl 1.71.0.dfsg.1-1 is broken! make sure you use 1.68.1.dfsg.1-0.2!
 	cp grml2usb.8 grml2usb.8.tmp
 	uniq grml2usb.8.tmp > grml2usb.8
-	# ugly hack to avoid '.sp' at the end of a sentence or paragraph:
-	sed -i 's/\.sp//' grml2usb.8
 	rm grml2usb.8.tmp
 	# grml2iso:
 	asciidoc -d manpage -b docbook grml2iso.8.txt
@@ -31,8 +29,6 @@ man-stamp: grml2usb.8.txt grml2iso.8.txt
 	# notice: docbook-xsl 1.71.0.dfsg.1-1 is broken! make sure you use 1.68.1.dfsg.1-0.2!
 	cp grml2iso.8 grml2iso.8.tmp
 	uniq grml2iso.8.tmp > grml2iso.8
-	# ugly hack to avoid '.sp' at the end of a sentence or paragraph:
-	sed -i 's/\.sp//' grml2iso.8
 	rm grml2iso.8.tmp
 	# we're done
 	touch man-stamp

grml2iso.8.txt

@@ -3,7 +3,7 @@ grml2iso(8)
 
 Name
 ----
-grml2iso - create a multiboot grml ISO using grml2usb
+grml2iso - create a multiboot Grml ISO using grml2usb
 
 Synopsis
 --------
@@ -16,8 +16,8 @@ Important! The grml team does not take responsibility for loss of any data!
 Introduction
 ------------
 
-grml2iso allows you to create a multiboot grml ISO. You can specify
-two or more grml ISOs and will get one single multiboot ISO as a result.
+grml2iso allows you to create a multiboot Grml ISO. You can specify
+two or more Grml ISOs and will get one single multiboot ISO as a result.
 grml2iso requires and uses grml2usb for this task and installs grub2
 as bootmanager on the multiboot ISO.
 
@@ -32,22 +32,22 @@ of all specified ISOs.
 
   *-o <target.iso>*::
 
-This option is mandatory and specifies where the resulting multiboot grml ISO
+This option is mandatory and specifies where the resulting multiboot Grml ISO
 should be placed. Note that (to avoid any possible data loss) grml2iso will exit
 if the specified target.iso exists already.
 
   *-c <directory>*::
 
 The content of the specified directory will be copied to the resulting
-multiboot grml ISO.
+multiboot Grml ISO.
 
   *-b <boot params>*::
 
 Use specified default bootoptions as default.
 
   *-f*::
 
-Force the program to run and overwrite an existing iso image.
+Force the program to run and overwrite an existing ISO image.
 
   *-r <boot param>*::
 
@@ -59,7 +59,12 @@ Execute grml2usb with the specified parameters. For a list of valid parameters h
 
   *-s <URI>*::
 
-Generate a small iso file which downloads the squashfs file from the specified URI. Due  to current limitations in busyboxs wget and DNS resolution, an URL can not contain a hostname but an IP only. This is useful if you want to boot systems which support booting iso image from your local system. Besides the iso image this command also copies the squashfs file to the output directory.
+Generate a small ISO file which downloads the squashfs file from the
+specified URI. Due  to current limitations in busyboxs wget and DNS
+resolution, an URL can not contain a hostname but an IP only. This is
+useful if you want to boot systems which support booting ISO image from
+your local system. Besides the iso image this command also copies the
+squashfs file to the output directory.
 
 Usage examples
 --------------
@@ -70,11 +75,12 @@ Create multiboot ISO /tmp/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.
 
  # grml2iso -b 'lang=de ssh=passwd' -c /tmp/grml-content -o /srv/grml.iso /srv/grml/grml_2009.10.iso
 
-Create a new iso with additional boot parameters and copy the content from /tmp/grml-content to the generated iso image.
+Create a new ISO with additional boot parameters and copy the content
+from /tmp/grml-content to the generated ISO image.
 
   # grml2iso -r quiet -r vga=791 -o /srv/grml.iso /srv/grml-small_2009.10.iso
 
-Create a new iso and remove existing boot parameters quiet and vga=791.
+Create a new ISO and remove existing boot parameters quiet and vga=791.
 
   # GRML2USB=/srv/git/grml2usb grml2iso -o /srv/grml.iso /srv/grml/grml_2009.05.iso /srv/grml/grml64-medium_2009.05.iso
 
@@ -88,7 +94,7 @@ Use /mnt/test/grml-tmp as working directory for creating the multiboot ISO
 
   # grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso
 
-Don't copy the addons from the specified iso images
+Don't copy the addons from the specified ISO images
 
 
 Online Ressources

grml2usb.8.txt

@@ -3,26 +3,27 @@ grml2usb(8)
 
 Name
 ----
-grml2usb - install grml ISO(s) on usb device for booting
+grml2usb - install Grml ISO(s) on usb device for booting
 
 Synopsis
 --------
 grml2usb [ options ] <ISO[s]> <device>
 
 *******************************************************************************
-Important! The grml team does not take responsibility for loss of any data!
+Important! The Grml team does not take responsibility for loss of any data!
 *******************************************************************************
 
 [[introduction]]
 Introduction
 ------------
 
-grml2usb installs grml on a given partition of your usb device and makes it
-bootable. It provides multi-iso support, meaning you can specify several grml
-ISOs on the command line at once and select the grml flavour you would like to
-boot on the bootprompt then. Note that the *first* ISO specified on the grml2usb
-command line will become the default one (that's the one that will boot when
-just pressing enter on the bootprompt or wait until the boot timeout matches).
+grml2usb installs Grml on a given partition of your usb device and makes
+it bootable. It provides multiboot ISO support, meaning you can specify
+several Grml ISOs on the command line at once and select the Grml
+flavour you would like to boot on the bootprompt then. Note that the
+*first* ISO specified on the grml2usb command line will become the
+default one (that's the one that will boot when just pressing enter on
+the bootprompt or wait until the boot timeout matches).
 
 [IMPORTANT]
 By default a compatible master boot record (MBR) is installed on the device
@@ -35,7 +36,7 @@ default MBR consider using '--syslinux-mbr' instead.
 Options
 -------
 
-The ISO[s] should be the path to one or multiple grml-ISOs and/or the path to
+ISO[s] should be the path to one or multiple grml-ISOs and/or the path to
 the currently running live-system (being /lib/live/mount/medium).
 
 The device either might be a device name like /dev/sdX1 or a directory. When
@@ -65,7 +66,7 @@ Copy files only but do *not* install a bootloader.
 
 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.
+identifying the Grml flavour would not be possible.
 
   *\--fat16*::
 
@@ -170,7 +171,7 @@ Install specified squashfs file instead of the default.
 //////////////////////////////////////////////////////////////////////////
   *\--uninstall*::
 
-Uninstall grml ISO files.
+Uninstall Grml ISO files.
 [Notice: not implemented yet.]
 //////////////////////////////////////////////////////////////////////////
 
@@ -227,7 +228,7 @@ Directory layout on usb device
 
   grml/
     |-- grml2usb.txt         [not yet implemented]
-    |-- grml-cheatcodes.txt  [list of bootoptions for grml]
+    |-- grml-cheatcodes.txt  [list of bootoptions for Grml]
     |-- grml-version.txt     [file containing information about grml-version]
     |-- LICENSE.txt          [license information]
     |-- md5sums              [md5sums of original ISO]
@@ -377,14 +378,14 @@ grml2usb.tgz.
 Why can't I just dd the ISO to a USB device?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Well, you can. :) Starting with grml 2009.10 the ISOs are dd-able straight out-of-the-box.
+Well, you can. :) Starting with Grml 2009.10 the ISOs are dd-able straight out-of-the-box.
 
 [IMPORTANT]
 Note that ANY existing data on your USB device will be destroyed when
 using the dd approach.
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-Grab a recent grml ISO and use
+Grab a recent Grml ISO and use
 link:http://syslinux.zytor.com/wiki/index.php/Doc/isolinux#HYBRID_CD-ROM.2FHARD_DISK_MODE[isohybrid
 from the syslinux project]:
 
@@ -616,9 +617,9 @@ Install specified ISO on device /dev/sdX1 remove vga=791 and nomce from existing
 
   # grml2usb --bootoptions="persistent-path=%flavour_name" grml64_2010.04.iso grml_2010.04.iso /dev/sdX1
 
-Install specified Isos on device /dev/sdx and add parameter persisten-path
+Install specified ISOs on device /dev/sdx and add parameter persisten-path
 to every menu entry. %flavour_name will be expanded to the flavour of the specific
-iso, e.g. grml64 and grml.
+iso, e.g. Grml64 and Grml.
 
 [[ressources]]
 Online Ressources