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

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-05-07 03:29:50 +0200 (Mon, 07 May 2007)
New Revision: 6823

Modified:
   trunk/homepage/xml/contact.xml
   trunk/homepage/xml/layout.xml
   trunk/homepage/xml/news.xml
Log:
- add netfilter workshop announce
- include myself as netfilter webmaster (not that I love web stuff but after all I'm doing all updates lately :)
- extend copyright years to 2007
- update reference to the GPG key in the netfilter core team contact section



Modified: trunk/homepage/xml/contact.xml
===================================================================
--- trunk/homepage/xml/contact.xml	2007-05-06 18:00:06 UTC (rev 6822)
+++ trunk/homepage/xml/contact.xml	2007-05-07 01:29:50 UTC (rev 6823)
@@ -68,7 +68,7 @@
 <listitem>Again, the coreteam will _NOT_ respond to any simple usage/configuration questions. Such kind of questions will be ignored. PLEASE refer to the <olink targetdoc="mailinglists" targetptr="ml-user">user mailinglist</olink></listitem>
 </itemizedlist>
 <para>
-You can contact the coreteam via email:<ulink url="mailto:coreteam at netfilter.org">coreteam at netfilter.org</ulink> (<ulink url="files/coreteam-gpg-key.txt">GPG key</ulink>)
+You can contact the coreteam via email:<ulink url="mailto:coreteam at netfilter.org">coreteam at netfilter.org</ulink> (<ulink url="files/coreteam-gpg-key-2D0987E6.txt">GPG key</ulink>)
 </para>
 </section>
 

Modified: trunk/homepage/xml/layout.xml
===================================================================
--- trunk/homepage/xml/layout.xml	2007-05-06 18:00:06 UTC (rev 6822)
+++ trunk/homepage/xml/layout.xml	2007-05-07 01:29:50 UTC (rev 6823)
@@ -15,7 +15,7 @@
 		altval="netfilter project logo"/>
 
 	<copyright>
-		<year>1999-2006</year>
+		<year>1999-2007</year>
 		<holder role="http://www.netfilter.org/">
 			The netfilter webmaster
 		</holder>
@@ -33,7 +33,7 @@
 	<headlink rel="bookmark" href="http://ipset.netfilter.org/" title="ipset"/>
 	<headlink rel="bookmark" href="http://www.hipac.org/" title="hipac"/>
 -->
-	<headlink rel="author" href="mailto:webmaster at netfilter.org" title="Harald Welte"/>
+	<headlink rel="author" href="mailto:webmaster at netfilter.org" title="Harald Welte, Pablo Neira Ayuso"/>
 	<headlink rel="sponsor" href="http://noris.net/" title="images/sponsor.png"/>
 
 	<style src="/style/netfilter.css" type="text/css" />
@@ -114,6 +114,10 @@
 			</tocentry>
 		</tocentry>
 		<tocentry page="news.xml" filename="news.html">
+			<tocentry id="toc-news-2007-05-07" href="/news.html#2007-05-07">
+				<title>2007-05-07: Netfilter Workshop</title>
+				<titleabbrev>Netfilter Workshop</titleabbrev>
+			</tocentry>
 			<tocentry id="toc-news-2007-04-16" href="/news.html#2007-04-16">
 				<title>2007-04-16: new PGP key</title>
 				<titleabbrev>new PGP key</titleabbrev>

Modified: trunk/homepage/xml/news.xml
===================================================================
--- trunk/homepage/xml/news.xml	2007-05-06 18:00:06 UTC (rev 6822)
+++ trunk/homepage/xml/news.xml	2007-05-07 01:29:50 UTC (rev 6823)
@@ -15,6 +15,18 @@
 <section>
 <title>News &amp; Announcements</title>
 
+<section id="2007-05-07">
+<title>2007-May-07</title>
+<blockquote>
+<section>
+<title>Netfilter Workshop in Karlsruhe, Germany</title>
+<para>
+Following the lastest successful workshop in Sevilla, Andalusia, Spain in september 2005. We are happy to announce the next edition in the workshop series. This year the event will be hosted in Karlsruhe, Germany from October 11th to 14th, 2007. For more information, please visit the <ulink url="http://workshop.netfilter.org/2007/">official website of the workshop</ulink>. 
+</para>
+</section>
+</blockquote>
+</section>
+
 <section id="2007-02-21">
 <title>2007-Feb-21</title>
 <blockquote>