bernhard: doc/www/src about-kolab-clients.html.m4, 1.21, 1.22 download.html.m4, 1.9, 1.10

[cvs at intevation.de]

Author: bernhard

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

Modified Files:
	about-kolab-clients.html.m4 download.html.m4 
Log Message:
Improved the KDE client sections in downloads and client page:

* Linked both sections to reduce information duplication 
* Pointed to KK, now that the webpage are there.
* Clarified status on client page, especially that proko2 branch
  still is recommended for production use
* KDE client: stable v 2.0->2.0.x; starting with KDE 3.4.1 -> 3.4.1

Downloads:
* Fixed: it is 1st.README now, not README.1st.


Index: about-kolab-clients.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- about-kolab-clients.html.m4	9 Aug 2005 16:37:24 -0000	1.21
+++ about-kolab-clients.html.m4	6 Dec 2005 12:05:30 -0000	1.22
@@ -30,26 +30,28 @@
   src="images/kontact-logo.png" align="right"></a>
 
 License: Free Software - GNU GPL<br>
-Status: stable 2.0
+Status: stable 2.0.x
 
 <p>
 The Kolab Project has developed a KDE Client which
-is based on Kontact and its components. All development is 
+is based on KDE Kontact and its components. All development was
 done within the KDE subversion repository 
 and contributed directly to the KDE project. Our improvements find their way
 into the main developments at the pace of the KDE project.
 
 <p>
-Starting with KDE 3.4.1, <a href="http://www.kontact.org/">Kontact</a>
+Starting with KDE 3.4, <a href="http://www.kontact.org/">Kontact</a>
 covers all the functionality that Kolab Server 2.0 offers except 
 personal distribution lists. 
 The full functionality will be in KDE 3.5 or later.
 
 <p>
-The full Kolab functionality is currently maintained for KDE-PIM 3.3 plus
-"proko2" as a result of commercial activities and carried
-out by Klarälvdalens Datakonsult AB and Intevation GmbH. They continue
-developments and prepare supported releases.
+For production usage, we recommend the "Proko2" branch of KDEPIM.
+Proko2 packages have seen most testing of the Kolab functions
+and can be build for KDE 3.2, 3.3 and 3.4 .
+Check out the <a href="./download.html#kolab2kdeclient"
+>KDE Client Download section</a>.
+
 
 
 <a name="toltec2">

Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- download.html.m4	3 Nov 2005 16:56:46 -0000	1.9
+++ download.html.m4	6 Dec 2005 12:05:30 -0000	1.10
@@ -63,7 +63,7 @@
 Next there always will be a directory "<b>sources</b>.
 It contains all source-RPM packages as needed for
 the OpenPKG environment. Also you will always find a
-"<b>README.1st</b>" which contains quick install
+"<b>1st.README</b>" which contains quick install
 instructions and hints on upgrades.
 
 <p>
@@ -83,15 +83,17 @@
 <h3>KDE Client for Kolab Server 2.0</h3>
 </a>
 
-The Kolab Groupware Project contributes any developments on the
-KDE client to the KDE project. The improvements find their way into the
-main developments at the pace of the KDE project. You may
-<a href="http://www.kde.org">either take one of the official
-KDE developments</a> <b>or take the most up-to-date version
-of the Kolab Groupware Project:</b>
+Check 
+<a href="./about-kolab-clients.html#kdeclient2"
+>the status of KDE Kolab client</a> to decide, what you need.
+<p>
+You may either
+<a href="http://www.kde.org/">take one of the official
+KDE developments</a> or <b>take the most up-to-date version
+of the Kolab Project:</b>
 
 <p>
-The Kolab Groupware Projects maintains the branch "proko2" in the
+The Kolab Projects maintains the branch "proko2" in the
 KDE SVN which is based on KDE 3.3. <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/kde-client/svn-instructions/">See here for the
 instructions how to check out from SVN</a>.
 
@@ -103,7 +105,9 @@
 
 <p>
 Uptodate, tested and supported packages for specific distributions
-are available by Klarälvdalens Datakonsult AB and Intevation GmbH.
+can be ordered from the
+<a href="http://www.Kolab-Konsortium.com/">Kolab Konsortium</a>.
+
 
 <a name="kolab1">
 <h2>Kolab-1</h2>