From: Michael Prokop <mika@grml.org>
Date: Fri, 14 Dec 2018 09:32:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/67'
X-Git-Tag: v0.33.1~3
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=14c8e935b938fae3515cb15b3f2b54823440434f;hp=94cc1788853e61e696d4226edd7a3e1f275a4598

Merge remote-tracking branch 'origin/github/pr/67'
---

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index fabc281..cc157ae 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -40,10 +40,9 @@ Regional settings:
 grml lang=at|de|cn|da|es|fr|it      Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard
 grml lang=nl|pl|ru|sk|tr|tw|us      Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard
 grml lang=$LANG-iso                 Activate $LANG (use like in lines above) with iso-mode instead of utf8
-grml gmt                            Use GMT-based time (UTC=yes)
-grml utc                            Use Coordinated Universal Time (UTC=yes)
-grml localtime                      Use local time (UTC=no)
-grml tz=Europe/Vienna               Use specified timezone for TZ
+grml utc|gmt                        Hardware Clock is set to Coordinated Universal Time (UTC)
+grml localtime                      Hardware Clock is set to local time (LOCAL), this is the default
+grml tz=Europe/Vienna               Use specified timezone for TZ, defaults to TZ=UTC
 grml keyboard=us xkeyboard=us       Use different keyboard layout (text-console/X)
 
 Configuration settings: