From: Michael Prokop Date: Fri, 1 Oct 2010 13:48:49 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.grml.org/grml-live X-Git-Tag: v0.12.0~38 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=0752ec6c360284452ed86fbd8649ad654c9158cc;hp=58a29c5b64acb0a39d08bdb854dd23b090d1a418 Merge branch 'master' of ssh://git.grml.org/grml-live --- diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index 6dc1697..a166606 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -33,7 +33,7 @@ Further documentation regarding the init process can be found at: * http://git.debian.org/?p=kernel/initramfs-tools.git;a=blob_plain;f=initramfs-tools.8;hb=HEAD The following boot options can be combined. -Notice: not all of the them are available on all the Grml flavours. +Notice: not all of them are available on all the Grml flavours. For example the X window system is not part of grml-small. Regional settings: