[netfilter-cvslog] r4309 - trunk/homepage/xml

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-29 21:54:37 +0200 (Thu, 29 Sep 2005)
New Revision: 4309

Modified:
   trunk/homepage/xml/events.xml
Log:
add lk2005 and netfilter workshop 2005


Modified: trunk/homepage/xml/events.xml
===================================================================
--- trunk/homepage/xml/events.xml	2005-09-28 14:03:13 UTC (rev 4308)
+++ trunk/homepage/xml/events.xml	2005-09-29 19:54:37 UTC (rev 4309)
@@ -22,12 +22,28 @@
 </para>
 
 <section>
-<title>2005-Jul-22: flow based accounting at OLS 2005</title>
+<title>2005-Oct-3 to Oct-8: netfilter/iptables developer workshop 2005</title>
 <para>
-Harald will be giving a presentation on his recent work on ip_conntrack based "flow based accounting" at <ulink url="http://linuxsymposium.org/2005">Ottawa Linux Symposium 2005</ulink>.
+The netfilter project will hold its <ulink url="http://workshop.netfilter.org/">annual developer workshop</ulink> in Seville, Spain.
 </para>
 </section>
 
+
+<section>
+<title>2005-Oct-10: netfilter/iptables tutorial at LK 2005</title>
+<para>
+Harald will be giving a netfilter/iptables tutorial at <ulink url="http://www.linux-kongress.org/2005">Linux-Kongress 2005</ulink> (Hamburg, Germany).
+</para>
+</section>
+
+<section>
+<title>2005-Oct-12: netfilter/iptables presentation at LK 2005</title>
+<para>
+Harald will be giving a presentation on his recent netfilter/iptables work (nfnetlink_log, nfnetlink_queue, libnfnetlink, ...) at <ulink url="http://www.linux-kongress.org/2005/">Linux-Kongress 2005</ulink> (Hamburg, Germany).
+</para>
+</section>
+
+
 <!--
 <section>
 <title>currently no upcoming events listed</title>
@@ -44,7 +60,14 @@
 This section lists past netfilter/iptables related events.
 </para>
 
+<section>
+<title>2005-Jul-22: flow based accounting at OLS 2005</title>
+<para>
+Harald will be giving a presentation on his recent work on ip_conntrack based "flow based accounting" at <ulink url="http://linuxsymposium.org/2005">Ottawa Linux Symposium 2005</ulink>.
+</para>
+</section>
 
+
 <section>
 <title>2005-Jun-23: flow based accounting at Linuxtag 2005</title>
 <para>