X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=contact%2Findex.html.tt2;h=698893c22c82fdb2f0e42760d7bf1e78f5f291f7;hb=f889fe7bc06111c3007d41058d115dd049d0e7e0;hp=0a862d8a78f7ed3e7cf2ac8dc13f100889121753;hpb=d9a36a4197f11c71da6a6ae62e645eb53be5a166;p=grml.org.git

diff --git a/contact/index.html.tt2 b/contact/index.html.tt2
index 0a862d8..698893c 100644
--- a/contact/index.html.tt2
+++ b/contact/index.html.tt2
@@ -7,10 +7,9 @@
 <meta name="Keywords" content="grml.org, grml" />
 <meta name="Description" content="Contact at grml.org" />
 <meta name="Abstract" content="grml, just another linux-distribution" />
-<meta name="fdse-index-as" content="http://www.grml.org/contact/" />
 <meta name="Robots" content="index,follow" />
 <meta name="Language" content="english" />
-<meta name="identifier-url" content="http://www.grml.org/" />
+<meta name="identifier-url" content="https://grml.org/" />
 <meta name="MSSmartTagsPreventParsing" content="true" />
 <meta http-equiv="imagetoolbar" content="no" />
 <link rel="home" href="/" title="grml.org" />
@@ -29,12 +28,13 @@
 
         <h1>Contact</h1>
 
-	<p>For general questions please join the Grml user mailinglist (see below).</p>
+        <p>For general questions please join the Grml user mailinglist (see below).</p>
 
         <p>If you have found a bug please <a href="/bugs/">report it</a>.</p>
 
-        <p>For commercial support and services please send us mail
-        to business (at) grml.org.</p>
+        <p>You can reach the Grml core team via team (at) grml.org.</p>
+
+        <p>For commercial support and services please send us mail to business (at) grml.org.</p>
 
         <a name="mailinglist"></a>
         <h2>Mailing lists</h2>
@@ -50,32 +50,32 @@
         mailing list</a>.  Anyone can post to this mailing list, but if you
         are not already subscribed, your message will need moderator approval before being posted. This way
         we limit the amount of spam that makes it to the list.  The Grml user
-        mailing list is available <a
-        href="http://dir.gmane.org/gmane.linux.distributions.grml.user">via
-        gmane</a> as well.</p>
+        mailing list is also available via NNTP on <a href="https://gmane.io/">gmane.io</a>.</p>
 
-        <p>If you are interested in following the <strong>development of
-        Grml</strong> you might be interested in the <a
-        href="http://ml.grml.org/mailman/listinfo/grml-devel">Grml developer
+        <p>If you are interested in following the <strong>development of Grml</strong> you might be
+        interested in the <a href="http://ml.grml.org/mailman/listinfo/grml-devel">Grml developer
         mailing list</a>. The <a
         href="http://ml.grml.org/mailman/listinfo/git-commits">Grml repository
         commits mailing list</a> tracks all the pushed commits to <a
-        href="http://git.grml.org/">Grml's git repositories</a>.  Changes in
-        Grml's Debian repository can be tracked via the <a
+        href="https://git.grml.org/">Grml's git repositories</a>, while we're
+        also present on <a href="https://github.com/grml/">github</a>. Changes
+        in Grml's Debian repository can be tracked via the <a
         href="http://ml.grml.org/mailman/listinfo/grml-testing-changes">Grml
-        Testing-changes mailing list</a>. The <a
-        href="http://ml.grml.org/mailman/listinfo/bugs-changes">bug-changes</a>
-        mailing list tracks all messages sent to <a
-        href="http://bts.grml.org/">Grml's Bug Tracking System</a>.</p>
+        Testing-changes mailing list</a>. We track issues at <a
+        href="https://github.com/grml/grml/issues">github.com/grml/grml/issues</a>.
+        Several Grml sub-projects (grml-debootstrap, grml-etc-core,
+        grml2usb,...) have their own repository and issue tracking, see <a
+        href="https://github.com/grml/">github.com/grml/</a> to get an
+        overview. If you're unsure where to report an issue though, feel free
+        to use <a href="https://github.com/grml/grml/issues">github.com/grml/grml/issues</a> though.</p>
 
-        <p><strong>Notice:</strong> All Grml mailing lists are <strong>English
-        only</strong>.</p>
+        <p><strong>Notice:</strong> All Grml mailing lists are <strong>English only</strong>.</p>
 
         <a name="irc"></a>
         <h2>IRC</h2>
 
-        <p>You can find us in <a href="irc://irc.freenode.net/grml">#grml on
-        irc.freenode.org</a>. Channel language is English.</p>
+        <p>You can find us in <a href="irc://irc.oftc.net/grml">#grml on irc.oftc.net</a>.
+        The channel language is English.</p>
 
 </div>