r7567 - trunk/homepage/xml

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-10-13 15:28:22 +0200 (Mon, 13 Oct 2008)
New Revision: 7567

Modified:
   trunk/homepage/xml/layout.xml
   trunk/homepage/xml/news.xml
Log:
merge iptables and libnetfilter_conntrack releases


Modified: trunk/homepage/xml/layout.xml
===================================================================
--- trunk/homepage/xml/layout.xml	2008-10-13 12:58:32 UTC (rev 7566)
+++ trunk/homepage/xml/layout.xml	2008-10-13 13:28:22 UTC (rev 7567)
@@ -117,14 +117,9 @@
 		</tocentry>
 		<tocentry page="news.xml" filename="news.html">
 			<tocentry id="toc-news-2008-10-13" href="/news.html#2008-10-13">
-				<title>2008-10-13: iptables 1.4.2 released</title>
-				<titleabbrev>iptables 1.4.2 released</titleabbrev>
+				<title>2008-10-13: several releases</title>
+				<titleabbrev>several releases</titleabbrev>
 			</tocentry>
-			<tocentry page="news.xml" filename="news.html">
-			<tocentry id="toc-news-2008-10-13" href="/news.html#2008-10-13">
-				<title>2008-10-13: libnetfilter_conntrack 0.0.97 released</title>
-				<titleabbrev>libnetfilter_conntrack-0.0.97 release</titleabbrev>
-			</tocentry>
 			<tocentry id="toc-news-2008-08-15" href="/news.html#2008-08-15">
 				<title>2008-08-15: ulogd 2.0.0beta2 released</title>
 				<titleabbrev>ulogd 2.0.0beta2 released</titleabbrev>

Modified: trunk/homepage/xml/news.xml
===================================================================
--- trunk/homepage/xml/news.xml	2008-10-13 12:58:32 UTC (rev 7566)
+++ trunk/homepage/xml/news.xml	2008-10-13 13:28:22 UTC (rev 7567)
@@ -23,18 +23,8 @@
 <para>
 The Netfilter Core Team has released <olink targetdoc="projects-iptables-downloads" targetptr="iptables-1.4.2">iptables-1.4.2</olink>.
 </para>
-</section>
-</blockquote>
-</section>
-
-<section id="2008-10-13">
-<title>2008-Oct-13</title>
-<blockquote>
-<section>
-<title>libnetfilter_conntrack 0.0.97 released</title>
 <para>
-The netfilter core team has released <olink targetdoc="projects-libnetfilter_conntrack-downloads" targetptr="libnetfilter_conntrack-0.0.97">libnetfilter_conntrack-0.0.97</olink> that includes minor fixes, some enhancements and cleanups.
-</para>
+The Netfilter Core Team has also released <olink targetdoc="projects-libnetfilter_conntrack-downloads" targetptr="libnetfilter_conntrack-0.0.97">libnetfilter_conntrack-0.0.97</olink> that includes minor fixes, some enhancements and cleanups.</para>
 </section>
 </blockquote>
 </section>