From 50f7843e018f6cf6330e5ac8d120dad69813121f Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 5 May 2017 14:16:16 +0200
Subject: [PATCH] No longer announce bts.grml.org for bug reports, mention
 https://github.com/grml/grml/issues instead

---
 bugs/index.html.tt2       | 21 +++++++--------------
 bugs/known/index.html.tt2 |  7 ++++++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/bugs/index.html.tt2 b/bugs/index.html.tt2
index 7e80283..97addac 100644
--- a/bugs/index.html.tt2
+++ b/bugs/index.html.tt2
@@ -29,24 +29,17 @@
 
         <h1>Reporting Bugs</h1>
 
-	<p>
-	Please check for <a href="/bugs/known/">known bugs</a> first.</p>
+        <p>Please check for <a href="/bugs/known/">known bugs</a> before reporting new ones.</p>
 
-        <ul>
-          <li>Web: <a href="http://bts.grml.org/grml/user?@template=register">Register</a> and then <a href="http://bts.grml.org/grml/issue?@template=item">Create an issue</a></li>
-          <li>Using E-Mail: Send mail to <code>bugs (at) grml.org</code></li>
-        </ul>
-
-        <p>Please be as specific as possible.</p>
+        <p>Send us your bug report to <code>bugs (at) grml.org</code>.</p>
 
-	<p>
-        Include at least:
+        <p>Please be as specific as possible. Include at least:
         <ul>
             <li>Steps to reproduce the problem</li>
-            <li>Expected behaviour</li>
-            <li>Actual behaviour</li>
-            <li>Your system configuration (run <code>grml-hwinfo</code>)</li>
-            <li>Software versions (try <code>foo --version</code> or <code>dpkg -l foo</code>)</li>
+            <li>Expected behavior</li>
+            <li>Actual behavior</li>
+            <li>Your system configuration (e.g. run <code>grml-hwinfo</code>)</li>
+            <li>Software versions (<code>grml-version</code> and for the tool in question try <code>foo --version</code> or <code>dpkg -l foo</code>)</li>
         </ul>
         </p>
 
diff --git a/bugs/known/index.html.tt2 b/bugs/known/index.html.tt2
index 57d7574..f016962 100644
--- a/bugs/known/index.html.tt2
+++ b/bugs/known/index.html.tt2
@@ -28,10 +28,15 @@
 
         <h1>Known Bugs</h1>
 
-        <p>Additional issues can be found in the Grml Bugtracker. <a href="http://bts.grml.org/grml/">List of Open Issues</a>.</p>
+        <p>We recently started to track issues at <a href="https://github.com/grml/grml/issues">github</a> (though haven't really migrated there yet).
+        Additional issues can be found in the Grml Bugtracker at <a href="http://bts.grml.org/grml/">bts.grml.org</a>.</p>
 
         <p>If you find additional bugs, please <a href="/bugs/">report them</a>.</p>
 
+        <h2>Known Bugs in Grml 2017.05</h2>
+
+        <p>No known yet.</p>
+
         <h2>Known Bugs in Grml 2014.11</h2>
 
         <ul>
-- 
2.1.4