From 1847502081edfc3272a617855974a706d90ad9ee Mon Sep 17 00:00:00 2001
From: Stefan Schlott <stefan@ploing.de>
Date: Tue, 29 Oct 2013 07:09:07 +0100
Subject: [PATCH] Events cleanup

---
 content/_data/locations.yaml                       | 14 ++++++++++++++
 .../200601-podiumsdiskussion-urheberrecht/index.md |  3 ++-
 content/events/200602-open-access/index.md         |  5 ++++-
 .../index.md                                       |  5 ++++-
 .../events/200604-wie-funktioniert-dsl/index.md    |  5 ++++-
 .../200605-gesundheitskarte-reloaded/index.md      |  2 +-
 content/events/200606-wikipedia/index.md           |  2 +-
 content/events/200607-linuxadministration/index.md |  5 ++++-
 content/events/200608-ip-routing/index.md          |  5 ++++-
 .../200609-geschichte-der-betriebssysteme/index.md |  9 ++++++---
 .../index.md                                       |  5 ++++-
 .../200611-open-source-free-software/index.md      |  5 ++++-
 .../events/200612-weihnachten-bei-geeks/index.md   |  5 ++++-
 content/events/200701-web2.0/index.md              |  2 +-
 content/events/200702-flames/index.md              |  2 +-
 .../index.md                                       |  2 +-
 .../200704-was-weiss-das-netz-ueber-mich/index.md  |  2 +-
 .../events/200705-dns-und-domainvergabe/index.md   |  2 +-
 content/events/200706-100-jahre-telefonie/index.md |  2 +-
 content/events/200707-attac-stuttgart/index.md     |  4 ++--
 .../200708-open-source-und-marketing/index.md      |  2 +-
 content/events/200709-kryptologie/index.md         |  2 +-
 .../200710-verantwortlichkeit-im-internet/index.md |  2 +-
 .../index.md                                       |  2 +-
 content/events/200712-openstreetmaps/index.md      |  4 ++--
 content/events/200801-websecurity/index.md         |  7 +++----
 content/events/200803-stromwechselparty/index.md   |  2 +-
 content/events/200804-filetransfer/index.md        |  2 +-
 content/events/200806-online-banking/index.md      |  2 +-
 .../index.md                                       |  2 +-
 content/events/200808-lightning-talks/index.md     |  2 +-
 .../200809-rechenzentrums-monitoring/index.md      |  2 +-
 .../index.md                                       |  2 +-
 content/events/200811-gez-grundlagen/index.md      |  2 +-
 .../index.md                                       |  2 +-
 .../events/200905-zukunft-der-demokratie/index.md  |  2 +-
 .../index.md                                       |  2 +-
 .../events/200907-einfuehrung-in-mysql/index.md    |  2 +-
 content/events/200908-lightning-talks/index.md     |  2 +-
 .../200909-freebsd-ports-und-packages/index.md     |  2 +-
 .../200910-internet-protocol-version-6/index.md    |  2 +-
 .../index.md                                       |  2 +-
 content/events/200912-kryptographie/index.md       |  2 +-
 content/events/201001-virtual-reality/index.md     |  2 +-
 .../index.md                                       |  2 +-
 .../201004-programmiersprache-python/index.md      |  2 +-
 .../index.md                                       |  2 +-
 .../index.md                                       |  4 ++--
 content/events/201007-wie-verhindere-ich/index.md  |  2 +-
 .../201008-hackerideologien-im-wandel/index.md     |  2 +-
 .../201009-selbstversuch-selbstauskunft/index.md   |  2 +-
 .../index.md                                       |  2 +-
 .../201011-befreundete-organisationen/index.md     |  2 +-
 .../201012-neue-medien-neue-gefahren/index.md      |  2 +-
 54 files changed, 102 insertions(+), 61 deletions(-)

diff --git a/content/_data/locations.yaml b/content/_data/locations.yaml
index 1ecaa146..f8bfeca0 100644
--- a/content/_data/locations.yaml
+++ b/content/_data/locations.yaml
@@ -36,3 +36,17 @@ oldbib:
   ort: Stuttgart
   lat: 48.776083
   lon: 9.184167
+wagenhalle:
+  name: Wagenhalle
+  strasse: Innerer Nordbahnhof 1
+# url: http://www.wagenhalle.org/
+  ort: Stuttgart
+  lat: 48.799722
+  lon: 9.186666
+bund:
+  name: Umweltzentrum des BUND
+  strasse: Rotebühlstraße 86/1
+  plz: 70178
+  ort: Stuttgart
+  lat: 48.7715
+  lon: 9.16
diff --git a/content/events/200601-podiumsdiskussion-urheberrecht/index.md b/content/events/200601-podiumsdiskussion-urheberrecht/index.md
index 5b9bfcc8..9c209e7e 100644
--- a/content/events/200601-podiumsdiskussion-urheberrecht/index.md
+++ b/content/events/200601-podiumsdiskussion-urheberrecht/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-01-12T19:00:00Z
-duration: 2h
+duration: 3h
 title: Podiumsdiskussion zum Thema Urheberrecht und Internet
 speakers:
   -
@@ -16,6 +16,7 @@ speakers:
     affiliation: Popbüro
 location:
   location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 material:
   -
     title: Folien zur Rechtslage (Thomas Hochstein)
diff --git a/content/events/200602-open-access/index.md b/content/events/200602-open-access/index.md
index ec87d4ca..97686050 100644
--- a/content/events/200602-open-access/index.md
+++ b/content/events/200602-open-access/index.md
@@ -1,11 +1,14 @@
 ---
 kind: event
 startdate: 2006-02-09T19:00:00Z
-duration: 2h
+duration: 3h
 title: OpenAccess - Freier Zugang zu wissenschaftlichem Wissen
 speakers:
   -
     name: Klaus Graf
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <ul>
 # <li> <strong>9.2.2006: Klaus Graf:</strong> OpenAccess<br>
diff --git a/content/events/200603-befreundete-organisationen-stellen-sich-vor/index.md b/content/events/200603-befreundete-organisationen-stellen-sich-vor/index.md
index c3cdfc65..f6e98675 100644
--- a/content/events/200603-befreundete-organisationen-stellen-sich-vor/index.md
+++ b/content/events/200603-befreundete-organisationen-stellen-sich-vor/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-03-16T19:00:00Z
-duration: 2h
+duration: 3h
 title: Befreundete Organisationen stellen sich vor
 speakers:
   -
@@ -12,6 +12,9 @@ speakers:
     name: Java User Group Stuttgart
   -
     name: Novell Stammtisch Stuttgart
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong><em>16.03.2006 ACHTUNG verlegter Termin (3. Donnerstag):</em></strong> <br>
 #        <strong>Befreundete Organisationen stellen sich vor</strong> <br>
diff --git a/content/events/200604-wie-funktioniert-dsl/index.md b/content/events/200604-wie-funktioniert-dsl/index.md
index 9fd38241..25d738da 100644
--- a/content/events/200604-wie-funktioniert-dsl/index.md
+++ b/content/events/200604-wie-funktioniert-dsl/index.md
@@ -1,11 +1,14 @@
 ---
 kind: event
 startdate: 2006-04-06T19:00:00Z
-duration: 2h
+duration: 3h
 title: Wie funktioniert DSL - Von Carrieren, Providern und Prozessen
 speakers:
   -
     name: Marc Haber, Geschäftsführer syscovery network services GmbH
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong><em>06.04.2006 ACHTUNG verlegter Termin (1. Donnerstag wg. Gründonnerstag)</em></strong> <br>
 #      Marc Haber, Geschäftsführer syscovery network services <notautolink>GmbH<br>
diff --git a/content/events/200605-gesundheitskarte-reloaded/index.md b/content/events/200605-gesundheitskarte-reloaded/index.md
index 4205b746..80c8007a 100644
--- a/content/events/200605-gesundheitskarte-reloaded/index.md
+++ b/content/events/200605-gesundheitskarte-reloaded/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-05-18T19:00:00Z
-duration: 2h
+duration: 3h
 title: Elektronische Gesundheitskarte und Gesundheitstelematik − 1984 reloaded?
 speakers:
   -
diff --git a/content/events/200606-wikipedia/index.md b/content/events/200606-wikipedia/index.md
index 3fed8850..57a7bb80 100644
--- a/content/events/200606-wikipedia/index.md
+++ b/content/events/200606-wikipedia/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-06-08T19:00:00Z
-duration: 2h
+duration: 3h
 title: Wikipedia − Die wunderbare Welt der Kollaboration
 speakers:
   -
diff --git a/content/events/200607-linuxadministration/index.md b/content/events/200607-linuxadministration/index.md
index e830da1e..206cb784 100644
--- a/content/events/200607-linuxadministration/index.md
+++ b/content/events/200607-linuxadministration/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-07-06T19:00:00Z
-duration: 2h
+duration: 3h
 title: Grundzüge der Linuxadministration
 speakers:
   -
@@ -10,6 +10,9 @@ material:
   -
     title: Vortragsfolien und angekündigte Links
     file: linux-administration.odp
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong>ACHTUNG schon wieder verlegter Termin:</strong> <br>
 #      <strong>06.07.2006: Jörg Hoh: Grundzüge der Linuxadministration</strong> - <br>
diff --git a/content/events/200608-ip-routing/index.md b/content/events/200608-ip-routing/index.md
index 340a30e9..67fced51 100644
--- a/content/events/200608-ip-routing/index.md
+++ b/content/events/200608-ip-routing/index.md
@@ -1,11 +1,14 @@
 ---
 kind: event
 startdate: 2006-08-10T19:00:00Z
-duration: 2h
+duration: 3h
 title: IP-Routing - Eine Einführung
 speakers:
   -
     name: Andreas 'ixs' Thienemann
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong>10.08.2006: Andreas 'ixs' Thienemann: "IP-Routing - Eine Einführung"</strong>
 # </li>
diff --git a/content/events/200609-geschichte-der-betriebssysteme/index.md b/content/events/200609-geschichte-der-betriebssysteme/index.md
index 2e6ce912..1107f2d4 100644
--- a/content/events/200609-geschichte-der-betriebssysteme/index.md
+++ b/content/events/200609-geschichte-der-betriebssysteme/index.md
@@ -1,15 +1,18 @@
 ---
 kind: event
 startdate: 2006-09-14T19:00:00Z
-duration: 2h
-title: Uranus - Die Geschichte der Betriebssysteme
+duration: 3h
+title: Die Geschichte der Betriebssysteme
 speakers:
   -
-    name: Bernd Onasch
+    name: Bernd Onasch (Uranus)
 material:
   -
     title: Präsentation "Geschichte der Betriebssysteme" (PDF)
     file: os.pdf
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong>14.09.2006: Bernd Onasch, Uranus: Die Geschichte der Betriebssysteme</strong> <br>
 #     <a href="http://www.cccs.de/wiki/pub/Main/VorTraege/os.pdf" target="_top">os.pdf</a>: Präsentation "Geschichte der Betriebssysteme" (PDF)
diff --git a/content/events/200610-internet-zwischen-freiheit-und-sicherheit/index.md b/content/events/200610-internet-zwischen-freiheit-und-sicherheit/index.md
index 076512c5..bc2bf327 100644
--- a/content/events/200610-internet-zwischen-freiheit-und-sicherheit/index.md
+++ b/content/events/200610-internet-zwischen-freiheit-und-sicherheit/index.md
@@ -1,11 +1,14 @@
 ---
 kind: event
 startdate: 2006-10-12T19:00:00Z
-duration: 2h
+duration: 3h
 title: Das Internet zwischen Freiheit und Sicherheit, Kommunikation und Zensur
 speakers:
   -
     name: Alvar Freude
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong>12.10.2006: Alvar Freude: "Das Internet zwischen Freiheit und Sicherheit, Kommunikation und Zensur"</strong>
 # </li>
diff --git a/content/events/200611-open-source-free-software/index.md b/content/events/200611-open-source-free-software/index.md
index d7883d5d..5bcdf833 100644
--- a/content/events/200611-open-source-free-software/index.md
+++ b/content/events/200611-open-source-free-software/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-11-09T19:00:00Z
-duration: 2h
+duration: 3h
 title: Free Software? Open Source? Worum geht's?
 speakers:
   -
@@ -10,6 +10,9 @@ material:
   -
     title: Präsentation Freie Software
     file: freiesoftware.adrien.pdf
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong>9.11.2006: Adrien Beaucreux: "Free Software? Open Source? Worum geht's?"</strong> <br>
 #    <a href="http://www.cccs.de/wiki/pub/Main/VorTraege/freiesoftware.adrien.pdf" target="_top">Praesentation Freie Software</a>
diff --git a/content/events/200612-weihnachten-bei-geeks/index.md b/content/events/200612-weihnachten-bei-geeks/index.md
index 99595678..1ec2d6ef 100644
--- a/content/events/200612-weihnachten-bei-geeks/index.md
+++ b/content/events/200612-weihnachten-bei-geeks/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2006-12-14T19:00:00Z
-duration: 2h
+duration: 3h
 title: Die gigantische ultimative Weihnachten bei Geeks-Party
 location:
   name: BUND Umweltzentrum
@@ -11,6 +11,9 @@ location:
 speakers:
   -
     name: Wir alle
+location:
+  location: wand5
+  details: Kinosaal 2 (Kommunales Kino)
 public: true
 # <li> <strong>14.12.2006: Wir alle: "Die gigantische ultimative <a href="http://www.cccs.de/wiki/bin/view/Main/Weihnachtsfeier" target="_top">Weihnachten bei Geeks-Party</a>"</strong>
 # </li>
diff --git a/content/events/200701-web2.0/index.md b/content/events/200701-web2.0/index.md
index e6fe6523..4778d1ed 100644
--- a/content/events/200701-web2.0/index.md
+++ b/content/events/200701-web2.0/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-01-11T19:00:00Z
-duration: 2h
+duration: 3h
 title: Web 2.0 in Deutschland - Was ist das, wem nützt das etwas
 speakers:
   -
diff --git a/content/events/200702-flames/index.md b/content/events/200702-flames/index.md
index dd203bdc..a2396d5f 100644
--- a/content/events/200702-flames/index.md
+++ b/content/events/200702-flames/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-02-08T19:00:00Z
-duration: 2h
+duration: 3h
 title: Flames - Kommunikationszusammenbrüche im Netz
 speakers:
   -
diff --git a/content/events/200703-gestaltungsmoeglichkeiten-pentests/index.md b/content/events/200703-gestaltungsmoeglichkeiten-pentests/index.md
index 2dafb1b6..31fc4292 100644
--- a/content/events/200703-gestaltungsmoeglichkeiten-pentests/index.md
+++ b/content/events/200703-gestaltungsmoeglichkeiten-pentests/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-03-08T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Gestaltungsmöglichkeiten von PenTests"
 speakers:
   -
diff --git a/content/events/200704-was-weiss-das-netz-ueber-mich/index.md b/content/events/200704-was-weiss-das-netz-ueber-mich/index.md
index fa1acb87..11499b06 100644
--- a/content/events/200704-was-weiss-das-netz-ueber-mich/index.md
+++ b/content/events/200704-was-weiss-das-netz-ueber-mich/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-04-12T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Was weiß das Netz über mich?"
 speakers:
   -
diff --git a/content/events/200705-dns-und-domainvergabe/index.md b/content/events/200705-dns-und-domainvergabe/index.md
index 476dd959..455bea30 100644
--- a/content/events/200705-dns-und-domainvergabe/index.md
+++ b/content/events/200705-dns-und-domainvergabe/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-05-10T19:00:00Z
-duration: 2h
+duration: 3h
 title: "DNS & Domainvergabe - wie geht das eigentlich"
 speakers:
   -
diff --git a/content/events/200706-100-jahre-telefonie/index.md b/content/events/200706-100-jahre-telefonie/index.md
index 5bea3870..9194e97d 100644
--- a/content/events/200706-100-jahre-telefonie/index.md
+++ b/content/events/200706-100-jahre-telefonie/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-06-14T19:00:00Z
-duration: 2h
+duration: 3h
 title: Die Geschichte der Telefonie / 100 Jahre Telefonie in Bopfingen am Ipf
 speakers:
   -
diff --git a/content/events/200707-attac-stuttgart/index.md b/content/events/200707-attac-stuttgart/index.md
index 336360e7..8ac08409 100644
--- a/content/events/200707-attac-stuttgart/index.md
+++ b/content/events/200707-attac-stuttgart/index.md
@@ -1,8 +1,8 @@
 ---
 kind: event
 startdate: 2007-07-05T19:00:00Z
-duration: 2h
-title: ATTAC Stuttgart gibt einen Überblick
+duration: 3h
+title: ATTAC Stuttgart stellt sich vor
 speakers:
   -
     name: Klaus Hellmick
diff --git a/content/events/200708-open-source-und-marketing/index.md b/content/events/200708-open-source-und-marketing/index.md
index ad896338..6ac06f30 100644
--- a/content/events/200708-open-source-und-marketing/index.md
+++ b/content/events/200708-open-source-und-marketing/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-08-09T19:00:00Z
-duration: 2h
+duration: 3h
 title: Open Source & Marketing
 speakers:
   -
diff --git a/content/events/200709-kryptologie/index.md b/content/events/200709-kryptologie/index.md
index eefee061..65248397 100644
--- a/content/events/200709-kryptologie/index.md
+++ b/content/events/200709-kryptologie/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-09-13T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Das Versteckspiel mit Daten: Einführung in die Kryptologie"
 speakers:
   -
diff --git a/content/events/200710-verantwortlichkeit-im-internet/index.md b/content/events/200710-verantwortlichkeit-im-internet/index.md
index 371c11dd..d28252a8 100644
--- a/content/events/200710-verantwortlichkeit-im-internet/index.md
+++ b/content/events/200710-verantwortlichkeit-im-internet/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-10-11T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Verantwortlichkeit im Internet: Haftung und Auskunftspflichten von Anbietern"
 speakers:
   -
diff --git a/content/events/200711-was-heisst-hier-eigentlich-sicher/index.md b/content/events/200711-was-heisst-hier-eigentlich-sicher/index.md
index 21e07a82..76b46e37 100644
--- a/content/events/200711-was-heisst-hier-eigentlich-sicher/index.md
+++ b/content/events/200711-was-heisst-hier-eigentlich-sicher/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2007-11-08T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Was heißt hier eigentlich sicher? - Grundzüge von Sicherheitsmanagement in der IT"
 speakers:
   -
diff --git a/content/events/200712-openstreetmaps/index.md b/content/events/200712-openstreetmaps/index.md
index 450feccc..6f839031 100644
--- a/content/events/200712-openstreetmaps/index.md
+++ b/content/events/200712-openstreetmaps/index.md
@@ -1,13 +1,13 @@
 ---
 kind: event
 startdate: 2007-12-13T19:00:00Z
-duration: 2h
+duration: 3h
 title: Openstreetmaps
 speakers:
   -
     name: Fabian Fingerle
   -
-    name: Hanno Boeck
+    name: Hanno Böck
 material:
   -
     title: Vortragsfolien (odp)
diff --git a/content/events/200801-websecurity/index.md b/content/events/200801-websecurity/index.md
index 018553db..850fa978 100644
--- a/content/events/200801-websecurity/index.md
+++ b/content/events/200801-websecurity/index.md
@@ -1,13 +1,12 @@
 ---
 kind: event
 startdate: 2008-01-10T19:00:00Z
-duration: 2h
-title: "Websecurity"
+duration: 3h
+title: WebSecurity
 speakers:
   -
     name: Stefan Schlott
-  -
-    name: Frank Kargl
+    affiliation: CCC Ulm
 location:
   location: wand5
   details: Kinosaal 2 (Kommunales Kino)
diff --git a/content/events/200803-stromwechselparty/index.md b/content/events/200803-stromwechselparty/index.md
index d22f1831..0203b6bb 100644
--- a/content/events/200803-stromwechselparty/index.md
+++ b/content/events/200803-stromwechselparty/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-03-06T19:00:00Z
-duration: 2h
+duration: 3h
 title: Stromwechselparty
 speakers:
   -
diff --git a/content/events/200804-filetransfer/index.md b/content/events/200804-filetransfer/index.md
index fbea33f1..7fc1a292 100644
--- a/content/events/200804-filetransfer/index.md
+++ b/content/events/200804-filetransfer/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-04-10T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Filetransfer"
 speakers:
   -
diff --git a/content/events/200806-online-banking/index.md b/content/events/200806-online-banking/index.md
index 125c0ce3..71b336e9 100644
--- a/content/events/200806-online-banking/index.md
+++ b/content/events/200806-online-banking/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-06-12T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Online-Banking"
 speakers:
   -
diff --git a/content/events/200807-braucht-freiheit-ueberwachungssicherheit/index.md b/content/events/200807-braucht-freiheit-ueberwachungssicherheit/index.md
index 2b90cbe9..7bde4b27 100644
--- a/content/events/200807-braucht-freiheit-ueberwachungssicherheit/index.md
+++ b/content/events/200807-braucht-freiheit-ueberwachungssicherheit/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-07-10T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Braucht Freiheit (Überwachungs-)Sicherheit?"
 speakers:
   -
diff --git a/content/events/200808-lightning-talks/index.md b/content/events/200808-lightning-talks/index.md
index 34fe4678..0c510276 100644
--- a/content/events/200808-lightning-talks/index.md
+++ b/content/events/200808-lightning-talks/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-08-14T19:00:00Z
-duration: 2h
+duration: 3h
 title: Lightning Talks (Kurzvorträge)
 speakers:
   -
diff --git a/content/events/200809-rechenzentrums-monitoring/index.md b/content/events/200809-rechenzentrums-monitoring/index.md
index 60f7c87f..8f92782c 100644
--- a/content/events/200809-rechenzentrums-monitoring/index.md
+++ b/content/events/200809-rechenzentrums-monitoring/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-09-11T19:00:00Z
-duration: 2h
+duration: 3h
 title: "Rechenzentrums-Monitoring für Arme - wie man es machen könnte"
 speakers:
   -
diff --git a/content/events/200810-ip-telefonie-tv-ueber-glasfaser/index.md b/content/events/200810-ip-telefonie-tv-ueber-glasfaser/index.md
index fb414d44..2947071a 100644
--- a/content/events/200810-ip-telefonie-tv-ueber-glasfaser/index.md
+++ b/content/events/200810-ip-telefonie-tv-ueber-glasfaser/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-10-09T19:15:00Z
-duration: 2h
+duration: 3h
 title: IP, Telefonie und TV ueber Glasfaser - Technik und Nicht-Technik
 speakers:
   -
diff --git a/content/events/200811-gez-grundlagen/index.md b/content/events/200811-gez-grundlagen/index.md
index 675e5b1a..076c5537 100644
--- a/content/events/200811-gez-grundlagen/index.md
+++ b/content/events/200811-gez-grundlagen/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-11-13T19:15:00Z
-duration: 2h
+duration: 3h
 title: "GEZ/Grundlagen des öffentlich-rechtlichen Systems"
 speakers:
   -
diff --git a/content/events/200812-gesetzgebung-mit-bezug-auf-meinungsfreiheit-und-privatsphaere/index.md b/content/events/200812-gesetzgebung-mit-bezug-auf-meinungsfreiheit-und-privatsphaere/index.md
index 67fafcae..4e0d3cc6 100644
--- a/content/events/200812-gesetzgebung-mit-bezug-auf-meinungsfreiheit-und-privatsphaere/index.md
+++ b/content/events/200812-gesetzgebung-mit-bezug-auf-meinungsfreiheit-und-privatsphaere/index.md
@@ -1,7 +1,7 @@
 ---
 kind: event
 startdate: 2008-12-11T19:15:00Z
-duration: 2h
+duration: 2 h
 title: Gesetzgebung und Persönlichkeitsrechte - Stand der Dinge
 speakers:
   -
diff --git a/content/events/200905-zukunft-der-demokratie/index.md b/content/events/200905-zukunft-der-demokratie/index.md
index c494a50d..a8aad588 100644
--- a/content/events/200905-zukunft-der-demokratie/index.md
+++ b/content/events/200905-zukunft-der-demokratie/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-05-14T19:30:00
+startdate: 2009-05-14T19:30:00Z
 duration: 2h
 title: Die Zukunft der Demokratie - Alles Bingo oder was?
 speakers:
diff --git a/content/events/200906-schnellere-webserver-mit-reverse-proxy/index.md b/content/events/200906-schnellere-webserver-mit-reverse-proxy/index.md
index a2d6cabe..b97251db 100644
--- a/content/events/200906-schnellere-webserver-mit-reverse-proxy/index.md
+++ b/content/events/200906-schnellere-webserver-mit-reverse-proxy/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-06-18T19:30:00
+startdate: 2009-06-18T19:30:00Z
 duration: 2h
 title: Schnellere Webserver mit Reverse Proxy
 speakers:
diff --git a/content/events/200907-einfuehrung-in-mysql/index.md b/content/events/200907-einfuehrung-in-mysql/index.md
index 6b3eec8a..371adc95 100644
--- a/content/events/200907-einfuehrung-in-mysql/index.md
+++ b/content/events/200907-einfuehrung-in-mysql/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-07-09T19:30:00
+startdate: 2009-07-09T19:30:00Z
 duration: 2h
 title: Einführung in MySQL
 speakers:
diff --git a/content/events/200908-lightning-talks/index.md b/content/events/200908-lightning-talks/index.md
index d6cc6039..8972944a 100644
--- a/content/events/200908-lightning-talks/index.md
+++ b/content/events/200908-lightning-talks/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-08-13T19:30:00
+startdate: 2009-08-13T19:30:00Z
 duration: 2h
 title: CCCS Lightning Talks
 speakers:
diff --git a/content/events/200909-freebsd-ports-und-packages/index.md b/content/events/200909-freebsd-ports-und-packages/index.md
index e22525e6..170611d0 100644
--- a/content/events/200909-freebsd-ports-und-packages/index.md
+++ b/content/events/200909-freebsd-ports-und-packages/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-09-10T19:30:00
+startdate: 2009-09-10T19:30:00Z
 duration: 2h
 title: FreeBSD Ports and Packaging
 speakers:
diff --git a/content/events/200910-internet-protocol-version-6/index.md b/content/events/200910-internet-protocol-version-6/index.md
index 99f7852b..b39b2e0a 100644
--- a/content/events/200910-internet-protocol-version-6/index.md
+++ b/content/events/200910-internet-protocol-version-6/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-10-08T19:30:00
+startdate: 2009-10-08T19:30:00Z
 duration: 2h
 title: IPv6 - Was kommt da eigentlich auf uns zu?
 speakers:
diff --git a/content/events/200911-voip-telefonanlage-gemeinschaft-und-asterisk/index.md b/content/events/200911-voip-telefonanlage-gemeinschaft-und-asterisk/index.md
index 1e22aabb..f14b9bdd 100644
--- a/content/events/200911-voip-telefonanlage-gemeinschaft-und-asterisk/index.md
+++ b/content/events/200911-voip-telefonanlage-gemeinschaft-und-asterisk/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-11-12T19:30:00
+startdate: 2009-11-12T19:30:00Z
 duration: 2h
 title: VoIP - Vorstellung der Open-Source VoIP-Telefonanlage Gemeinschaft
 speakers:
diff --git a/content/events/200912-kryptographie/index.md b/content/events/200912-kryptographie/index.md
index 6dab3a40..f5baf0f0 100644
--- a/content/events/200912-kryptographie/index.md
+++ b/content/events/200912-kryptographie/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2009-12-10T19:30:00
+startdate: 2009-12-10T19:30:00Z
 duration: 2h
 title: Kryptographie
 speakers:
diff --git a/content/events/201001-virtual-reality/index.md b/content/events/201001-virtual-reality/index.md
index ac6891aa..c9c9986a 100644
--- a/content/events/201001-virtual-reality/index.md
+++ b/content/events/201001-virtual-reality/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-01-14T19:30:00
+startdate: 2010-01-14T19:30:00Z
 duration: 2h
 title: "VR im Reallife - Virtual Reality fuer Einsteiger"
 speakers:
diff --git a/content/events/201002-ueberleben-im-grossprojektdschungel/index.md b/content/events/201002-ueberleben-im-grossprojektdschungel/index.md
index 1453d0e9..cdfda20f 100644
--- a/content/events/201002-ueberleben-im-grossprojektdschungel/index.md
+++ b/content/events/201002-ueberleben-im-grossprojektdschungel/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-02-11T19:30:00
+startdate: 2010-02-11T19:30:00Z
 duration: 2h
 title: "Überleben im Grossprojektdschungel"
 speakers:
diff --git a/content/events/201004-programmiersprache-python/index.md b/content/events/201004-programmiersprache-python/index.md
index b0f39f45..42e7e0fe 100644
--- a/content/events/201004-programmiersprache-python/index.md
+++ b/content/events/201004-programmiersprache-python/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-04-08T19:30:00
+startdate: 2010-04-08T19:30:00Z
 duration: 2h
 title: Python, warum noch eine Skriptsprache?
 speakers:
diff --git a/content/events/201005-leichtigkeit-der-mail-und-datenverschluesselung/index.md b/content/events/201005-leichtigkeit-der-mail-und-datenverschluesselung/index.md
index 2492cc02..ae4caefc 100644
--- a/content/events/201005-leichtigkeit-der-mail-und-datenverschluesselung/index.md
+++ b/content/events/201005-leichtigkeit-der-mail-und-datenverschluesselung/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-05-06T19:30:00
+startdate: 2010-05-06T19:30:00Z
 duration: 2h
 title: "Die Leichtigkeit der Mail- und Datenverschlüsselung in der Praxis - GnuPG"
 speakers:
diff --git a/content/events/201006-lightning-talks-backup-strategien/index.md b/content/events/201006-lightning-talks-backup-strategien/index.md
index ea940dd5..84dcc0af 100644
--- a/content/events/201006-lightning-talks-backup-strategien/index.md
+++ b/content/events/201006-lightning-talks-backup-strategien/index.md
@@ -1,8 +1,8 @@
 ---
 kind: event
-startdate: 2010-06-10T19:30:00
+startdate: 2010-06-10T19:30:00Z
 duration: 2h
-title: Lightning Talks - Kurzvorträge
+title: Lightning Talks - Kurzvorträge - Professionelles Backup
 speakers:
   -
     name: Helmut Springer
diff --git a/content/events/201007-wie-verhindere-ich/index.md b/content/events/201007-wie-verhindere-ich/index.md
index c19fc1f6..f36c1f32 100644
--- a/content/events/201007-wie-verhindere-ich/index.md
+++ b/content/events/201007-wie-verhindere-ich/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-07-08T19:30:00
+startdate: 2010-07-08T19:30:00Z
 duration: 2h
 title: "Wie verhindere ich, dass der Rechner meine Diplomarbeit frisst?"
 speakers:
diff --git a/content/events/201008-hackerideologien-im-wandel/index.md b/content/events/201008-hackerideologien-im-wandel/index.md
index 57dd3f73..0112361d 100644
--- a/content/events/201008-hackerideologien-im-wandel/index.md
+++ b/content/events/201008-hackerideologien-im-wandel/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-08-12T19:30:00
+startdate: 2010-08-12T19:30:00Z
 duration: 2h
 title: "Hackerideologie im Wandel"
 speakers:
diff --git a/content/events/201009-selbstversuch-selbstauskunft/index.md b/content/events/201009-selbstversuch-selbstauskunft/index.md
index 0a15e187..bb8a826c 100644
--- a/content/events/201009-selbstversuch-selbstauskunft/index.md
+++ b/content/events/201009-selbstversuch-selbstauskunft/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-09-09T19:30:00
+startdate: 2010-09-09T19:30:00Z
 duration: 2h
 title: "Selbstversuch Selbstauskunft"
 speakers:
diff --git a/content/events/201010-datenschutz-fuer-systemadministratoren/index.md b/content/events/201010-datenschutz-fuer-systemadministratoren/index.md
index c70933df..0402fd4e 100644
--- a/content/events/201010-datenschutz-fuer-systemadministratoren/index.md
+++ b/content/events/201010-datenschutz-fuer-systemadministratoren/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-10-14T19:30:00
+startdate: 2010-10-14T19:30:00Z
 duration: 2h
 title: "Datenschutz für Systemadministratoren"
 speakers:
diff --git a/content/events/201011-befreundete-organisationen/index.md b/content/events/201011-befreundete-organisationen/index.md
index 65ce0f3b..e1a3a5b4 100644
--- a/content/events/201011-befreundete-organisationen/index.md
+++ b/content/events/201011-befreundete-organisationen/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-11-11T19:30:00
+startdate: 2010-11-11T19:30:00Z
 duration: 2h
 title: Befreundete Organisationen stellen sich vor 2.0
 speakers:
diff --git a/content/events/201012-neue-medien-neue-gefahren/index.md b/content/events/201012-neue-medien-neue-gefahren/index.md
index 6e0ec025..463b9142 100644
--- a/content/events/201012-neue-medien-neue-gefahren/index.md
+++ b/content/events/201012-neue-medien-neue-gefahren/index.md
@@ -1,6 +1,6 @@
 ---
 kind: event
-startdate: 2010-12-09T19:30:00
+startdate: 2010-12-09T19:30:00Z
 duration: 2h
 title: "Neue Medien, neue Gefahren"
 speakers: