From: Michael Prokop <mika@grml.org>
Date: Sat, 24 Oct 2009 12:27:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git@git.grml.org/grml2usb
X-Git-Tag: v0.9.14~1
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=863f75014eac9dc7ba1bc5711080e9ded5602b93;hp=ed4a822cca8dfe6124439022642b736dacff8e64

Merge branch 'master' of ssh://git@git.grml.org/grml2usb
---

diff --git a/grml2usb.8.txt b/grml2usb.8.txt
index 21ef5d1..8f3d776 100644
--- a/grml2usb.8.txt
+++ b/grml2usb.8.txt
@@ -134,7 +134,8 @@ Do not install /boot/addons/ files (like dos, grub, memdisk,...).
   *\--remove-bootoption=...*::
 
 Remove specified bootoption (could be a regex) from existing boot options. Use
-multiple entries for removing different bootoptions at once.
+multiple entries for removing different bootoptions at once. (Note: this option
+is not support in grml2usb-compat.)
 
   *\--skip-grub-config*::