bernhard: doc/www/src documentation.html.m4, 1.6, 1.7 footer.html.m4, 1.15, 1.16 index.html.m4, 1.24, 1.25

cvs at intevation.de cvs at intevation.de
Thu Aug 12 17:17:37 CEST 2004


Author: bernhard

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv7891

Modified Files:
	documentation.html.m4 footer.html.m4 index.html.m4 
Log Message:
Changed kroupware.org to kroupware.kolab.org (we have the DNS here).
Tried to improve the intro lines.
Added news about new mirros carrying server snapshots.
Added news about storage format draft.


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- documentation.html.m4	12 Aug 2004 13:22:29 -0000	1.6
+++ documentation.html.m4	12 Aug 2004 15:17:35 -0000	1.7
@@ -4,7 +4,7 @@
 
 <p>Documents on this page were published after the conclusion of the Kroupware
 Project. Currently the most up to date versions are still accessible from the
-<a href="http://kroupware.org/documentation.html">Kroupware documentation page</a>.
+<a href="http://kroupware.kolab.org/documentation.html">Kroupware documentation page</a>.
 </p>
 
 <h2>KDE Kolab1 Client Manual</h2>

Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- footer.html.m4	10 Jun 2004 22:48:34 -0000	1.15
+++ footer.html.m4	12 Aug 2004 15:17:35 -0000	1.16
@@ -24,15 +24,17 @@
 <div class="mbox" id="logo">
 <a href="index.html"><img title="Homepage" src="images/kolab_logo.small.png"></a>
 <br /><br/>
+<font size=+1>
 LINK(`screenshots.html', `Screenshots')
 LINK(`documentation.html', `Documentation')
+</font>
 </div>
 
 <!-- INSTALL/DOWNLOAD -->
 <div class="mbh">How to install / Download</div>
 <div class="mbox">
-Check the <a href="http://kroupware.org/">Kroupware Pages</a> for installation
-instructions for the latest stable version.
+Check the <a href="http://kroupware.kolab.org/">Kroupware Pages</a> for installation
+instructions for the original Kolab1 software.
 </div>
 
 <!-- ADMIN/USERS -->
@@ -95,7 +97,7 @@
 <!-- EXITS -->
 <div class="mbh">Exits</div>
 <div class="mbox">
-<a href="http://kroupware.org/">Kroupware</a>
+<a href="http://kroupware.kolab.org/">Kroupware</a>
 </div>
 
 <!-- Menu end -->

Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- index.html.m4	11 Jun 2004 17:08:14 -0000	1.24
+++ index.html.m4	12 Aug 2004 15:17:35 -0000	1.25
@@ -3,13 +3,17 @@
 <div id="date">This page was updated on:<br />$Date$</div>
 
 <p id="intro">
-The goal of the Kolab Project is to maintain and enhance
-a Free Software groupware solution called Kolab.
-It builds on software and concepts developed during the
-<a href="http://kroupware.org/">Kroupware Project</a>,
-in particular the Kolab Server and KDE Kolab Client.
+Kolab is a Free Software Groupware Solution.
+The project is about the <strong>Kolab Concept</strong>
+and some software implementing it, like
+the <strong>Kolab Server</strong> and 
+several clients, e.g. the <strong>KDE Kolab Client</strong>.
+Kolab builds on software and concepts 
+developed during the 
+<a href="http://kroupware.kolab.org/">Kroupware Contract</a>.
 </p>
 
+
 <h2>News</h2>
 
 <!-- BEGIN LATEST BLOCK -->
@@ -17,27 +21,59 @@
 
 <!-- HEADER LINE -->
 <table>
-<tr><td class="newsd">May 28th, 2004</td>
+<tr><td class="newsd">August 12th, 2004</td>
 <td class="newsh">»
-  <a href="http://www.citadel.org/kolab.php">
-  Citadel as Kolab1 server.</a>
+  <a href="http://www.kolab.org/pipermail/kolab-users/2004-August/000794.html"
+  >New mirrors carry server snapshots</a>
 </td></tr>
 </table>
 <!-- ITEM BODY -->
 <div class="newsb">
-  Freebusy handling, directory server architecure
-  and lack of legacy support make it slightly different,
-  but Citatel/UX v6.21 was fully tested with KDE Kolab1 Clients.
+  Two new mirrors of ftp.kolab.org are available.
+  They carry development snaphots of the Kolab2 Server.
 </div>
 
+<!-- HEADER LINE -->
+<table>
+<tr><td class="newsd">August 12th, 2004</td>
+<td class="newsh">»
+	 Kolab Storage Format Draft as PDF 
+</td></tr>
+</table>
+<!-- ITEM BODY -->
+<div class="newsb">
+The upcoming Kolab2 implementations will use a new format
+for saving its data on the server. This has been discussed on the format
+list and specs are in CVS. Now a draft pdf version is available in
+the documentation section.
+</div>
+
+
+
 </div>
 <!-- END LATEST BLOCK -->
 
+
 <!-- BEGIN NEWS BLOCK -->
 <div class="news">
 
 <!-- HEADER LINE -->
 <table>
+<tr><td class="newsd">May 28th, 2004</td>
+<td class="newsh">»
+  <a href="http://www.citadel.org/kolab.php">
+  Citadel as Kolab1 server.</a>
+</td></tr>
+</table>
+<!-- ITEM BODY -->
+<div class="newsb">
+  Freebusy handling, directory server architecure
+  and lack of legacy support make it slightly different,
+  but Citatel/UX v6.21 was fully tested with KDE Kolab1 Clients.
+</div>
+
+<!-- HEADER LINE -->
+<table>
 <tr><td class="newsd">May 10th, 2004</td>
 <td class="newsh">»
   <a href="http://kolab.org/pipermail/kolab-announce/2004/000003.html"
@@ -157,6 +193,7 @@
   The <a href="http://kroupware.org/news/pr-20030725.html"
   >Kroupware Project has been completed</a>, and as a result Kolab has emerged.
 </div>
+>>>>>>> 1.24
 
 </div>
 <!-- END NEWS BLOCK -->
@@ -177,8 +214,8 @@
       Microsoft Outlook(tm) and KDE Kolab Client as well as look up your <strong>Free/Busy times</strong> to name
       but a few things.
       <p>
-      <a href="http://kroupware.org/howto-kolab-kde-client.html">Installation of the KDE Kolab Client</a>
-      is explained on the <a href="http://kroupware.org/">Kroupware pages</a>.
+      <a href="http://kroupware.kolab.org/howto-kolab-kde-client.html">Installation of the KDE Kolab Client</a>
+      is explained on the <a href="http://kroupware.kolab.org/">Kroupware pages</a>.
       </td>
     </tr>
 
@@ -264,8 +301,8 @@
         </li>
         </ul>
 
-    <a href="http://kroupware.org/howto-kolab.html">Installation of the Kolab Server</a>
-    is explained on the <a href="http://kroupware.org/">Kroupware pages</a>.
+    <a href="http://kroupware.kolab.org/howto-kolab.html">Installation of the Kolab Server</a>
+    is explained on the <a href="http://kroupware.kolab.org/">Kroupware pages</a>.
 
     <p>
     Some of the major components of Kolab Server are:





More information about the commits mailing list