david: doc/kolab-formats commonfields.sgml, 1.21, 1.22 kolabformat.sgml, 1.12, 1.13

[cvs at intevation.de]

Author: david

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv1097

Modified Files:
	commonfields.sgml kolabformat.sgml 
Log Message:
Revert addition of scheduling-id, as discussed today on IRC with Joon, Till and Steffen.
Version is now 2.0-rc2


Index: commonfields.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/commonfields.sgml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- commonfields.sgml	3 May 2005 10:53:31 -0000	1.21
+++ commonfields.sgml	12 May 2005 13:48:16 -0000	1.22
@@ -53,7 +53,6 @@
 <para><programlisting><![CDATA[
         <summary>(string, default empty)</summary>
         <location>(string, default empty)</location>
-        <scheduling-id>(string, default not present)</scheduling-id>
         <creator>
           <display-name>(string, default empty)</display-name>
           <smtp-address>(string, default empty)</smtp-address>
@@ -80,15 +79,6 @@
           <role>(string, default required)</role>
         </attendee>}
 ]]></programlisting></para>
-
-<para>The scheduling ID is usually not set (meaning that it's identical to the UID).
-The only case where it's set, is when the event comes from accepting an incidence.
-In that case, the scheduling ID is the same as the UID of the initial invitation,
-and this incidence has a different UID. The scheduling ID is used for all
-scheduling purposes, in particular for matching replies with invitations.
-The reason for not using the same UID in both incidences is that they would
-conflict if they are stored in different calendar folders.</para>
-<!-- http://www.kolab.org/pipermail/kolab-format/2004-October/000471.html -->
 
 <para>The start-date is optional for tasks. For events, it is required. If
 they are there, they can either have a date or a datetime as the

Index: kolabformat.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolabformat.sgml	3 May 2005 14:53:47 -0000	1.12
+++ kolabformat.sgml	12 May 2005 13:48:16 -0000	1.13
@@ -112,6 +112,14 @@
 </revremark>
 </revision>
 
+<revision>
+<revnumber>2.0rc2</revnumber>
+<date>May 12th, 2005</date>
+<revremark>
+Removed scheduling-id.
+</revremark>
+</revision>
+
 <!--
 <revision>
 <revnumber>CVS $Revision$</revnumber>