From: Michael Prokop <mika@grml.org>
Date: Fri, 9 Dec 2011 15:11:25 +0000 (+0100)
Subject: Rework contact section
X-Git-Url: http://git.grml.org/?p=grml.org.git;a=commitdiff_plain;h=4f5f34f177cd04d9bca9e29999e79230e7c65e27

Rework contact section
---

diff --git a/contact/index.php b/contact/index.php
index 731588b..671d0e1 100644
--- a/contact/index.php
+++ b/contact/index.php
@@ -27,13 +27,55 @@
 
         <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 that here</a>.</p>
 
-        <p>For commercial support and services please send us a mail to business (at) grml.org.</p>
+        <p>For commercial support and services please send us a mail
+        to business (at) grml.org.</p>
+
+        <a name="mailinglist"></a>
+        <h2>Mailing lists</h2>
+
+        <p>If you want to be noticed 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 mailinglist</a>.</p>
+
+        <p>If you want to participate on the <strong>mailinglist of
+        Grml</strong> please subscribe to the <a
+        href="http://ml.grml.org/mailman/listinfo/grml">Grml user
+        mailinglist</a>.  Anyone can post to this mailinglist list, but if you
+        are not already subscribed, your message will be moderated. In this way,
+        we limit the amount of spam entering the message lists.  The Grml user
+        mailinglist 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 <strong>development of
+        Grml</strong> you might be interested in the <a
+        href="http://ml.grml.org/mailman/listinfo/grml-devel">Grml developer
+        mailinglist</a>. The <a
+        href="http://ml.grml.org/mailman/listinfo/git-commits">Grml repository
+        commits mailinglist</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 mailinglist</a>. The <a
+        href="http://ml.grml.org/mailman/listinfo/bugs-changes">bug-changes</a>
+        mailinglist tracks all messages sent to <a
+        href="http://bts.grml.org/">Grml's Bug Tracking System</a>.</p>
+
+        <p><strong>Notice:</strong> All Grml mailinglists are <strong>english
+        only</strong>.</p>
+
+        <a name="irc"></a>
+        <h2>IRC</h2>
+
+        <p>You can find us at <a href="irc://irc.freenode.net/grml">#grml on
+        irc.freenode.org</a>. Channel language is english.</p>
 
 </div>
 
diff --git a/irc/devmeeting_20100107.txt b/irc/devmeeting_20100107.txt
deleted file mode 100644
index 1830694..0000000
--- a/irc/devmeeting_20100107.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-Latest change: Sam Feb 13 02:36:36 CET 2010 [mika]
-
-Grml Developer Meeting on IRC - 2010-01-07
-==========================================
-
-Present and active
-------------------
-
-Official start at 21:00 CET.
-
-* formorer [joined at 23:07, left at 00:13]
-* ft [left at 00:32]
-* gebi [left at 00:50]
-* jimmy [left at 23:40]
-* mika
-* mrud
-* Rhonda [left around 23:54]
-
-Official/final end at 01:09 CET.
-
-Topics
-------
-
-* Mirror infrastructure:
-  - which is our main mirror? [Rhonda / formorer]
-  - who can update it and how? [Rhonda / formorer]
-  - policies/guidelines/howto for 3rd party mirrors [Rhonda / mika]
-    - git repos grml-mirrors + grml-mirrors-private [mika: done]
-  - collect 3rd party mirror admin information? [Rhonda]
-  - geolocation?  -> download.grml.org [formorer]
-  - Use additional checksum like sha1/sha256? [mika - done]
-
-* Grml-Homepage:
-  - make it based on a .git repository for collaborative editing
-  - convert to ikiwiki [technical part: formorer, structural part: mika]
-    - git repos grml-homepage [mika: done]
-    - integrate wiki.grml.org in main grml.org structure
-    - integrate http://grml.org/online-docs/ in ikiwiki structure
-    - mrud will work on a css layout that matches the current layout of grml.org
-
-* Switch to Debian/testing as base?
-  - No, keep unstable as a base: as we still want to continue doing Q/A work with
-    daily builds and a switch to testing might lead to pinning-hell we decided to
-    continue as until now [team decision]
-
-* Q/A work:
-  - autotesting system based on KVM for daily ISOs [mrud + mika]
-    http://people.redhat.com/~dhowells/keyutils/rhts_environment.sh
-
-* Sources:
-  - continue providing sources.grml.org
-  - in the long term let's establish our own daily debian-mirror
-  - generate daily snapshots of grml's mirror ("reprepro gensnapshot grml-testing $(date ...)")
-  - fallback to snapshots.debian.org (currently: http://stabile.debian.org:5001/)
-
-* How could we improve the boot process? Making sure that an ISO tries to boot
-  exactly the same version and doesn’t boot another system from harddisk.
-
-  Concept:
-
-  - each ISO (*not* squashfs specific) provides a file named /boot/uuid.txt
-    * if this file isn't present just continue booting as until now
-
-  - bootloader provides uuid=$CONTENT_OF_uuid.txt to kernel's cmdline
-
-  - unless isofrom= or nfsroot= are specified on cmdline bootfrom=removable is used
-
-  - initramfs reads /proc/cmdline and check argument of uuid= bootoption
-
-  - initramfs scans devices for precense of /boot/uuid.txt and if it exists
-    validate against uuid=... of /proc/cmdline
-    * match: boot
-    * does not match: continue searching
-
-  Use cases:
-
-  - live ISO: grml-live provides according uuid.txt and bootloader config OOTB:
-    nothing to do
-
-  - copying ISO to harddisk: if using isofrom=... then the files on harddisk are
-    considered for use, otherwise the devices aren't scanned at all by default
-    because of bootfrom=removable
-
-  - grml2{usb,iso} grml.iso grml64.iso /dev/sdX: grml2{usb,iso} generates a
-    *new* /boot/uuid.txt on the device and adjusts bootloader configuration
-    accordingly
-
-  - PXE boot: works OOTB because nfsroot=... is present
-
-  TODOs:
-
-  - implement uuidgen > <install>/boot/uuid.txt in grml-live [mika]
-  - implement according toolchain for live-initramfs [mika]
-  - adjust grml2usb, grml2iso,... accordingly then [mrud]
-
-  => implemented
-
-* Grub1 and Grub2 shipping on one ISO
-  - jimmy will work on a grub1 Debian package
-    - contact upstream so efforts could be brought to Debian
-
-* Autobuild setup for Debian packages
-  - wanna-build like feature in reprepro with sbuild [formorer]
-
-* Grml's Roundup is spammed. How to resolve this?
-  - make sure removing users works again [mika/mrud/formorer]
-  - make sure removing messages works [mika/mrud/formorer]
-
-* Redmine as project management/bts/homepage/wiki/....?
-  - homepage: no (ikiwiki)
-  - wiki: no (-> ikiwiki)
-  - bts / project management: would be nice, yes [formorer will check out the
-    performance issue]
-
-* Workflow with Git and policy how we create and maintain Debian packages
-  - upstream sources in .git vs. debian/-only
-  - needs further discussion, gebi will have a look at workflow from
-    http://people.debian.org/~mika/forensics/maintainer.html
-
-* grml-policy:
-  - should be extended according to our recent development
-
-* Unify code as much as possible, discuss how we could create/provide a
-  grml-core package.
-  - grml-core: distinguish between grml-specific function, like
-    checkbootparam/islivecd and check4root...
-  - grml-lsb: provide /etc/grml/lsb-functions
-  - remove unecessary stuff from grml-etc-core (move to grml-lsb and grml-core)
-  - let grml-{scripts,shlib,autoconfig} use grml-core
-  - provide stuff that's shared/used within
-    grml-{setlang,lang,keyboard,autoconfig} through grml-core
-
-* get rid of release-stoppers
-  - run a BSP
-
-* Left for further discussions / needs further investigation:
-  - grml-API
-  - Switch to isolinux as boot loader for hybrid cds?
-  - Upgrade to aufs2?
-  - Kernel stuff
-  - Unify bootoptions stuff (grml-cheatcodes.txt documentation and definition)
-    - DSL for defining bootoptions (ssh, nofb,...) and further processing
-      for according bootloader(s) - long-term goal [mrud]
diff --git a/irc/index.php b/irc/index.php
index 978a83c..c26c8be 100644
--- a/irc/index.php
+++ b/irc/index.php
@@ -1,42 +1,5 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>grml.org - IRC</title>
-<meta name="Title" content="grml.org - IRC" />
-<meta name="Author" content="the grml team [www.grml.org/team/]" />
-<meta name="Keywords" content="grml.org, grml" />
-<meta name="Description" content="IRC of grml.org" />
-<meta name="Abstract" content="grml, just another linux-distribution" />
-<meta name="fdse-index-as" content="http://www.grml.org/irc/" />
-<meta name="Robots" content="index,follow" />
-<meta name="Language" content="english" />
-<meta name="identifier-url" content="http://www.grml.org/" />
-<meta name="MSSmartTagsPreventParsing" content="true" />
-<meta http-equiv="imagetoolbar" content="no" />
-<link rel="home" href="/" title="grml.org" />
-<link rel="help" href="/features/" title="About" />
-<link rel="author" href="/team/" title="Team" />
-<link rel="icon" href="/favicon.png" type="image/png" />
-<link rel="stylesheet" href="/style.css" type="text/css" />
-</head>
+<?
+Header("Location: http://grml.org/contact/#irc");
+exit();
+?>
 
-<body>
-<?php include '../static.inc'; ?>
-
-      <div class="content">
-
-            <p><img style="float: right; border: 0" src="/img/mail.png" alt="*" /></p>
-            
-            <h1>IRC</h1>
-            
-	    <p>You can meet us at <a href="irc://irc.freenode.net/grml">#grml on
-	      irc.freenode.org</a>. Channel language is english by default,
-	    though most of Grml's developers speak german as well.</p>
-
-            <p>Get <a href="http://irssi.org/documentation/startup">irssi</a> and join
-            us! If you are running Grml and have network access just run irssi and
-            you will be auto connected to the grml-channel.</p>
-
-      </div>
-      
-<?php include '../static_bottom.inc'; ?>
diff --git a/mailinglist/index.php b/mailinglist/index.php
index 70c3f1f..e50f728 100644
--- a/mailinglist/index.php
+++ b/mailinglist/index.php
@@ -1,69 +1,5 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>grml.org - Mailinglist</title>
-<meta name="Title" content="grml.org - Mailinglist" />
-<meta name="Author" content="the grml team [www.grml.org/team/]" />
-<meta name="Keywords" content="grml.org, grml" />
-<meta name="Description" content="Mailinglist of grml.org" />
-<meta name="Abstract" content="grml, just another linux-distribution" />
-<meta name="fdse-index-as" content="http://www.grml.org/mailinglist/" />
-<meta name="Robots" content="index,follow" />
-<meta name="Language" content="english" />
-<meta name="identifier-url" content="http://www.grml.org/" />
-<meta name="MSSmartTagsPreventParsing" content="true" />
-<meta http-equiv="imagetoolbar" content="no" />
-<link rel="home" href="/" title="grml.org" />
-<link rel="help" href="/features/" title="About" />
-<link rel="author" href="/team/" title="Team" />
-<link rel="icon" href="/favicon.png" type="image/png" />
-<link rel="stylesheet" href="/style.css" type="text/css" />
-</head>
+<?
+Header("Location: http://grml.org/contact/#mailinglist");
+exit();
+?>
 
-<body>
-<?php include '../static.inc'; ?>
-
-      <div class="content">
-
-            <p><img style="float: right; border: 0" src="/img/mail.png" alt="*" /></p>
-
-            <h1>Mailinglist</h1>
-
-            <p>If you want to be noticed 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 mailinglist</a>.</p>
-
-            <p>If you want to participate on the <strong>mailinglist
-              of Grml</strong> please subscribe to
-              the <a href="http://ml.grml.org/mailman/listinfo/grml">Grml
-              user mailinglist</a>.  Anyone can post to this
-              mailinglist list, but if you are not already subscribed,
-              your message will be moderated. In this way, we limit
-              the amount of spam entering the message lists.  The Grml
-              user mailinglist 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 <strong>development
-              of Grml</strong> you might be interested in
-              the <a href="http://ml.grml.org/mailman/listinfo/grml-devel">Grml
-              developer
-              mailinglist</a>. The <a href="http://ml.grml.org/mailman/listinfo/git-commits">Grml
-              repository commits mailinglist</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
-              mailinglist</a>. The <a href="http://ml.grml.org/mailman/listinfo/bugs-changes">bug-changes</a>
-              mailinglist tracks all messages sent
-              to <a href="http://bts.grml.org/">Grml's Bug Tracking
-              System</a>.</p>
-
-            <p><strong>Notice:</strong> All Grml mailinglists are
-            <strong>english only</strong>.</p>
-
-      </div>
-
-<?php include '../static_bottom.inc'; ?>
diff --git a/static.inc b/static.inc
index bef5e6f..a269f6a 100644
--- a/static.inc
+++ b/static.inc
@@ -38,18 +38,10 @@
                 <a class="plain" href="/bugs/known/">Known Bugs</a><br/>
                 <a class="plain" href="/beta/">Beta Versions</a><br/>
               </p>
-            <h3>Support</h3>
+            <h3>Get in touch</h3>
               <p>
-                <a class="plain" href="/mailinglist/">Mailing Lists</a><br/>
-                <a class="plain" href="/irc/">IRC</a><br/>
                 <a class="plain" href="/contact/">Contact</a><br/>
               </p>
-
-<!--
-	    <a href="/donations/"><img style="border: 0"
-	    src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="donations" /></a>
--->
-
             <h3>Search</h3>
               <p>
 <!-- Google CSE Search Box Begins  -->