X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=contact%2Findex.php;h=9b1dd70ab7c478fc43dc5d17465b7212310642de;hb=cf359350a0db272c1ec8424ec6c0a0e476cff86b;hp=ca25d518542139c894d8d4edf9c405e1cfe5a43a;hpb=c39f079208e4a8e8a354e19e17d34ee43699e908;p=grml.org.git

diff --git a/contact/index.php b/contact/index.php
index ca25d51..9b1dd70 100644
--- a/contact/index.php
+++ b/contact/index.php
@@ -25,15 +25,57 @@
 
 <div class="content">
 
-	<p><img style="float: right; border: 0" src="/img/mail.png" alt="*" /></p>
+        <p><img style="float: right; border: 0" src="/img/mail.png" alt="*" /></p>
 
-	<h1>Contact us</h1>
+        <h1>Contact</h1>
 
-    <p>For general questions please join the <a href="/mailinglist/">Grml user mailinglist</a>.</p>
+	<p>For general questions please join the Grml user mailinglist (see below).</p>
 
-    <p>If you have found a bug or want to request new packages, please <a href="/bugs/">report that here</a>.</p>
+        <p>If you have found a bug please <a href="/bugs/">report it</a>.</p>
 
-    <p>For commercial support and services please visit <a href="http://grml-solutions.com/">Grml Solutions</a>.</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>
+
+        <p>If you want to be notified when a <strong>new Grml
+        release</strong> is available, subscribe to the
+        read-only <a href="http://ml.grml.org/mailman/listinfo/grml-announce">Grml
+        announce mailing list</a>.</p>
+
+        <p>If you want to participate in the <strong>mailing list of
+        Grml</strong>, please subscribe to the <a
+        href="http://ml.grml.org/mailman/listinfo/grml">Grml user
+        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>
+
+        <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="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>
+
+        <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>
 
 </div>