From: Michael Prokop <mika@grml.org>
Date: Mon, 28 Jan 2019 20:58:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/25'
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=3cfb6e46c0d507f249b45b289429f004f5bf4789;hp=bbaf16ee8d5879484dd7ab2e77c5ccd9d34cc40f;p=grml.org.git

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

diff --git a/faq/index.html.tt2 b/faq/index.html.tt2
index 57c8908..a8e18ec 100644
--- a/faq/index.html.tt2
+++ b/faq/index.html.tt2
@@ -119,7 +119,7 @@
 
         <p>Codename of Grml 2018.12 is "Gnackwatschn", which is
         an austrian and bavarian word, meaning "hit in the neck".
-	We consider this an alternative to a facepalm.
+	We consider this an alternative to a facepalm; although a "Gnackwatschn" isn't usually self-inflicted.
 
         <h3><a name="requirements"></a><a href="#toc">Requirements for running Grml</a></h3>