schreiber: doc/www/src index.html.m4, 1.115, 1.116 newsarchive.html.m4, 1.14, 1.15
cvs at kolab.org
cvs at kolab.org
Wed May 2 15:29:27 CEST 2007
Author: schreiber
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv860
Modified Files:
index.html.m4 newsarchive.html.m4
Log Message:
solved conflict
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- index.html.m4 20 Apr 2007 17:36:26 -0000 1.115
+++ index.html.m4 2 May 2007 13:29:25 -0000 1.116
@@ -81,6 +81,14 @@
<p>
+
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
<table>
<tr><td class="newsd">March 15th - 21st, 2007</td>
<td class="newsh">»
@@ -101,9 +109,7 @@
<br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br>
<a href="http://www.univention.de/vortraege_cebit_2007.html">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
</li></ul>
-</div>
-<p>
-
+ </div>
<table>
<tr><td class="newsd">February 12th 2007</td>
@@ -118,10 +124,8 @@
</div>
<p>
-</div> <!-- END LATEST BLOCK -->
-<!-- BEGIN NEWS BLOCK --> <div class="news">
<table>
<tr><td class="newsd">February 5th, 2007</td>
@@ -137,8 +141,6 @@
announcement</a> for details.
</div>
<p>
-
-
<table>
<tr><td class="newsd">January 17th, 2007</td>
<td class="newsh">»
@@ -151,90 +153,6 @@
<a href="http://www.kolab.org/pipermail/kolab-announce/2007/000046.html">
announcement</a> for details.
</div>
-<p>
-
-<table>
-<tr><td class="newsd">December 19th, 2006</td>
-<td class="newsh">»
- Security Advisory 14 for Kolab Server (ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
- Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
- A new ClamAV RPM with a fix is available. See the
- <a href="security/kolab-vendor-notice-14.txt">Kolab Security
- Issue 14</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 16th, 2006</td>
-<td class="newsh">»
- Kolab Server 2.1 Beta 3 released
-</td></tr>
-</table>
-<div class="newsb">
- This release fixes more than 30 problems found in Beta 2 and
- includes the security updates published until now. See
- the <a
- href="http://www.kolab.org/pipermail/kolab-announce/2006/000044.html">release
- notes</a> for more details and information on upgrading from Kolab
- Server 2.0 to 2.1.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 14th - 16th, 2006</td>
-<td class="newsh">»
- Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany
-</td></tr>
-</table>
-<div class="newsb">
- <a href="http://www.univention.de/english.html">Univention</a>,
- business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
- presents the Kolab-based Univention Groupware Server
- (UGS).<br />
- (Special exhibition Linux/OS in the office, hall 11.2)
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 2nd, 2006</td>
-<td class="newsh">»
- New KDE Kolab Client released, revision 'proko2 2.1.5'.
-</td></tr>
-</table>
-<div class="newsb">
- This release contains several fixes and
- a few new features, like:
- <p>
-
- <ul>
- <li>Ability to add ones signature at top of
- an email reply automatically
- or manually at the cursor position.
-
- <li>An extra button to send an email to results
- of LDAP queries and the possibility to reach that query
- dialog directly from the address selection dialog.
- </ul>
- The release notes contain the full list.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">October 23th - 27th, 2006</td>
-<td class="newsh">»
- Kolab-based UGS at Systems 2006 in Munich, Germany
-</td></tr>
-</table>
-<div class="newsb">
- <a href="http://www.univention.de/english.html">Univention</a>,
- business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
- shows the Kolab-based Univention Groupware Server (UGS).<br />
- (hall 3 - booth A3.441-12)
-</div>
-<p>
</div> <!-- END NEWS BLOCK -->
Index: newsarchive.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- newsarchive.html.m4 17 Apr 2007 09:32:08 -0000 1.14
+++ newsarchive.html.m4 2 May 2007 13:29:25 -0000 1.15
@@ -16,6 +16,89 @@
<div class="news">
<table>
+<tr><td class="newsd">December 19th, 2006</td>
+<td class="newsh">»
+ Security Advisory 14 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+ Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
+ A new ClamAV RPM with a fix is available. See the
+ <a href="security/kolab-vendor-notice-14.txt">Kolab Security
+ Issue 14</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 16th, 2006</td>
+<td class="newsh">»
+ Kolab Server 2.1 Beta 3 released
+</td></tr>
+</table>
+<div class="newsb">
+ This release fixes more than 30 problems found in Beta 2 and
+ includes the security updates published until now. See
+ the <a
+ href="http://www.kolab.org/pipermail/kolab-announce/2006/000044.html">release
+ notes</a> for more details and information on upgrading from Kolab
+ Server 2.0 to 2.1.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 14th - 16th, 2006</td>
+<td class="newsh">»
+ Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany
+</td></tr>
+</table>
+<div class="newsb">
+ <a href="http://www.univention.de/english.html">Univention</a>,
+ business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
+ presents the Kolab-based Univention Groupware Server
+ (UGS).<br />
+ (Special exhibition Linux/OS in the office, hall 11.2)
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 2nd, 2006</td>
+<td class="newsh">»
+ New KDE Kolab Client released, revision 'proko2 2.1.5'.
+</td></tr>
+</table>
+<div class="newsb">
+ This release contains several fixes and
+ a few new features, like:
+ <p>
+
+ <ul>
+ <li>Ability to add ones signature at top of
+ an email reply automatically
+ or manually at the cursor position.
+
+ <li>An extra button to send an email to results
+ of LDAP queries and the possibility to reach that query
+ dialog directly from the address selection dialog.
+ </ul>
+ The release notes contain the full list.
+</div>
+
+
+<table>
+<tr><td class="newsd">October 23th - 27th, 2006</td>
+<td class="newsh">»
+ Kolab-based UGS at Systems 2006 in Munich, Germany
+</td></tr>
+</table>
+<div class="newsb">
+ <a href="http://www.univention.de/english.html">Univention</a>,
+ business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
+ shows the Kolab-based Univention Groupware Server (UGS).<br />
+ (hall 3 - booth A3.441-12)
+</div>
+
+
+<table>
<tr><td class="newsd">October 19th, 2006</td>
<td class="newsh">»
Security Advisory 13 for Kolab Server (ClamAV)
More information about the commits
mailing list