From ff7aa61a546be74a48ff3e609ba894d26039151a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 11 Dec 2016 17:48:00 +0100
Subject: [PATCH] ta-iptables: neues Datum

---
 Makefile                              | 4 ++--
 content/news/ta-iptables-nftables.xml | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e5b6e10f7..0b84a1703 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ MAKEFLAGS += -rR
 PROCESSOR=xsltproc
 PFLAGS=--novalid --catalogs --stringparam baseurl $(BASEURL)
 BASEURL=""
-RM=/bin/rm -f
+RM=rm -f
 # XML-Validator
 VALIDATOR=xmllint
 VFLAGS=--noout --nonet
@@ -296,7 +296,7 @@ datenspuren-2016-mp3.xml:
 	$(WGET) -O $@ https://media.ccc.de/c/ds2016/podcast/mp3.xml
 
 build/datenspuren/$(DS_YEAR)/schedule-%.raw.xml: content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/%.html scripts/hyphenate.sed $(DATESTAMP)
-	 scripts/hyphenate.sed < $< > $@
+	 sed scripts/hyphenate.sed < $< > $@
 build/datenspuren/$(DS_YEAR)/schedule-%.xml : VFLAGS_IN=$(VFLAGS) --html
 build/datenspuren/$(DS_YEAR)/schedule-%.xml : PFLAGS+=--html
 build/datenspuren/$(DS_YEAR)/schedule-%.xml : STYLE=xsl/datenspuren/frab2xml.xsl
diff --git a/content/news/ta-iptables-nftables.xml b/content/news/ta-iptables-nftables.xml
index 0670daf89..98ad37777 100644
--- a/content/news/ta-iptables-nftables.xml
+++ b/content/news/ta-iptables-nftables.xml
@@ -4,10 +4,15 @@
 <item title="TA: iptables/nftables" date="2016-12-08T21:30:00" author="Astro">
   <image title="Etherkiller">etherkiller.jpg</image>
   <event>
-    <start>2016-12-20T19:00:00</start>
+    <start>2016-12-22T19:00:00</start>
     <location><link href="space.html">HQ</link> im Zentralwerk</location>
   </event>
 
+  <p>
+    Wichtig! Terminänderung! Der Themenabend findet am 22.12 statt nicht am
+    20.12.
+  </p>
+
   <p>
     Damit eure Geräte nicht komplett offen in <link
     href="https://events.ccc.de/congress/2016/wiki/Static:Network">offenen