bernhard: doc/architecture client_server.sgml,1.23,1.24

[cvs at intevation.de]

Author: bernhard

Update of /kolabrepository/doc/architecture
In directory doto:/tmp/cvs-serv18652

Modified Files:
	client_server.sgml 
Log Message:
client_server.sgml:
Deleted two missleading paragraphs:
        a) about visual merging of calendar information, because
        the KDE Kolab Client does visually merge this. Only Outlook
        cannot do it.

        b) About that freebusy can be uploaded and will only
        affect one folder. This has changed with Kolab2 long ago.
Fixed a typo.



Index: client_server.sgml
===================================================================
RCS file: /kolabrepository/doc/architecture/client_server.sgml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- client_server.sgml	7 Jan 2005 18:42:37 -0000	1.23
+++ client_server.sgml	23 Nov 2005 17:14:37 -0000	1.24
@@ -216,8 +216,10 @@
 </para>
 <para>
 In the future clients may upload free-busy lists to the Kolab server using
-secure WebDAV. This will be useful for calendars not being stored on the Kolab
-server but which are still relevant for the free-busy status of a user. Such a usage
+secure WebDAV. 
+This will be useful for calendars not being stored on the Kolab
+server but which are still relevant for the free-busy status of a user. 
+Such a usage
 model might for example be motivated by privacy concerns.
 </para>
 <para>
@@ -613,20 +615,11 @@
 of groupware folders.
 </para>
 <para>
-The Kolab client knows about its standard folders for each identiry for the
+The Kolab Client knows about its standard folders for each identity for the
 groupware functionality. This is required in order
 to allow the client to know where to store accepted invitation, tasks, notes or
 contacts which it got via email and also in case
 a user has multiple personal calendar folders etc.
-</para>
-<para>
-The published freebusy list is generated by the client from the standard
-calendar folder only. Other calendars do not affect the personal
-freebusy list.
-</para>
-<para>
-Visual merging of calendars e.g. of the personal calendar and a group calendar
-is intentially not provided.
 </para>
 <para>
 When granting access to a subfolder it is the responsibility of the user to