merge libical-0.17 onto the head

svn path=/trunk/; revision=3449

2 files changed, 17 insertions, 17 deletions

diff --git a/libical/design-data/prop-to-value.txt b/libical/design-data/prop-to-value.txt
index 017c944983..a06bdc31f1 100644
--- a/libical/design-data/prop-to-value.txt
+++ b/libical/design-data/prop-to-value.txt
@@ -36,7 +36,7 @@ LAST-MODIFIED        DATE-TIME
 SEQUENCE             INTEGER
 X-LIC-ERROR	     TEXT
 X-LIC-CLUSTERCOUNT   INTEGER
-REQUEST-STATUS       STRING
+REQUEST-STATUS       STRING             
 ATTACH               ATTACH             # Non-std: URI or BINARY
 GEO                  GEO                # Non-std: Two FLOATS
 DTEND                DATE-TIME-DATE     # Non-std: DATE-TIME or DATE
diff --git a/libical/design-data/restrictions.csv b/libical/design-data/restrictions.csv
index e93f0a2a2a..bf71d96327 100644
--- a/libical/design-data/restrictions.csv
+++ b/libical/design-data/restrictions.csv
@@ -8,7 +8,7 @@ PUBLISH,VEVENT,UID,NONE,ONE
 PUBLISH,VEVENT,RECURRENCEID,NONE,ZEROORONE
 PUBLISH,VEVENT,SEQUENCE,NONE,ZEROORONE
 PUBLISH,VEVENT,ATTACH,NONE,ZEROPLUS
-PUBLISH,VEVENT,CATEGORIES,NONE,ZEROORONE
+PUBLISH,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
 PUBLISH,VEVENT,CLASS,NONE,ZEROORONE
 PUBLISH,VEVENT,COMMENT,NONE,ZEROORONE
 PUBLISH,VEVENT,CONTACT,NONE,ZEROPLUS
@@ -47,7 +47,7 @@ REQUEST,VEVENT,SEQUENCE,NONE,ZEROORONE
 REQUEST,VEVENT,SUMMARY,NONE,ONE
 REQUEST,VEVENT,UID,NONE,ONE
 REQUEST,VEVENT,ATTACH,NONE,ZEROPLUS
-REQUEST,VEVENT,CATEGORIES,NONE,ZEROORONE
+REQUEST,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
 REQUEST,VEVENT,CLASS,NONE,ZEROORONE
 REQUEST,VEVENT,COMMENT,NONE,ZEROORONE
 REQUEST,VEVENT,CONTACT,NONE,ZEROPLUS
@@ -85,7 +85,7 @@ REPLY,VEVENT,RECURRENCEID,NONE,ZEROORONE
 REPLY,VEVENT,UID,NONE,ONE
 REPLY,VEVENT,SEQUENCE,NONE,ZEROORONE
 REPLY,VEVENT,ATTACH,NONE,ZEROPLUS
-REPLY,VEVENT,CATEGORIES,NONE,ZEROORONE
+REPLY,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
 REPLY,VEVENT,CLASS,NONE,ZEROORONE
 REPLY,VEVENT,COMMENT,NONE,ZEROORONE
 REPLY,VEVENT,CONTACT,NONE,ZEROPLUS
@@ -125,7 +125,7 @@ ADD,VEVENT,SUMMARY,NONE,ONE
 ADD,VEVENT,UID,NONE,ONE
 ADD,VEVENT,ATTACH,NONE,ZEROPLUS
 ADD,VEVENT,ATTENDEE,NONE,ZEROPLUS
-ADD,VEVENT,CATEGORIES,NONE,ZEROORONE
+ADD,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
 ADD,VEVENT,CLASS,NONE,ZEROORONE
 ADD,VEVENT,COMMENT,NONE,ZEROORONE
 ADD,VEVENT,CONTACT,NONE,ZEROPLUS
@@ -163,7 +163,7 @@ CANCEL,VEVENT,SEQUENCE,NONE,ONE
 CANCEL,VEVENT,UID,NONE,ONE
 CANCEL,VEVENT,COMMENT,NONE,ZEROORONE
 CANCEL,VEVENT,ATTACH,NONE,ZEROPLUS
-CANCEL,VEVENT,CATEGORIES,NONE,ZEROORONE
+CANCEL,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
 CANCEL,VEVENT,CLASS,NONE,ZEROORONE
 CANCEL,VEVENT,CONTACT,NONE,ZEROPLUS
 CANCEL,VEVENT,CREATED,NONE,ZEROORONE
@@ -242,7 +242,7 @@ COUNTER,VEVENT,SUMMARY,NONE,ONE
 COUNTER,VEVENT,UID,NONE,ONE
 COUNTER,VEVENT,ATTACH,NONE,ZEROPLUS
 COUNTER,VEVENT,ATTENDEE,NONE,ZEROPLUS
-COUNTER,VEVENT,CATEGORIES,NONE,ZEROORONE
+COUNTER,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
 COUNTER,VEVENT,CLASS,NONE,ZEROORONE
 COUNTER,VEVENT,COMMENT,NONE,ZEROORONE
 COUNTER,VEVENT,CONTACT,NONE,ZEROPLUS
@@ -381,7 +381,7 @@ PUBLISH,VTODO,SEQUENCE,NONE,ZEROORONE
 PUBLISH,VTODO,SUMMARY,NONE,ONE
 PUBLISH,VTODO,UID,NONE,ONE
 PUBLISH,VTODO,ATTACH,NONE,ZEROPLUS
-PUBLISH,VTODO,CATEGORIES,NONE,ZEROORONE
+PUBLISH,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
 PUBLISH,VTODO,CLASS,NONE,ZEROORONE
 PUBLISH,VTODO,COMMENT,NONE,ZEROORONE
 PUBLISH,VTODO,CONTACT,NONE,ZEROPLUS
@@ -421,7 +421,7 @@ REQUEST,VTODO,SEQUENCE,NONE,ZEROORONE
 REQUEST,VTODO,SUMMARY,NONE,ONE
 REQUEST,VTODO,UID,NONE,ONE
 REQUEST,VTODO,ATTACH,NONE,ZEROPLUS
-REQUEST,VTODO,CATEGORIES,NONE,ZEROORONE
+REQUEST,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
 REQUEST,VTODO,CLASS,NONE,ZEROORONE
 REQUEST,VTODO,COMMENT,NONE,ZEROORONE
 REQUEST,VTODO,CONTACT,NONE,ZEROPLUS
@@ -457,7 +457,7 @@ REPLY,VTODO,ORGANIZER,NONE,ONE
 REPLY,VTODO,REQUESTSTATUS,NONE,ONEPLUS
 REPLY,VTODO,UID,NONE,ONE
 REPLY,VTODO,ATTACH,NONE,ZEROPLUS
-REPLY,VTODO,CATEGORIES,NONE,ZEROORONE
+REPLY,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
 REPLY,VTODO,CLASS,NONE,ZEROORONE
 REPLY,VTODO,COMMENT,NONE,ZEROORONE
 REPLY,VTODO,CONTACT,NONE,ZEROPLUS
@@ -497,7 +497,7 @@ ADD,VTODO,SUMMARY,NONE,ONE
 ADD,VTODO,UID,NONE,ONE
 ADD,VTODO,ATTACH,NONE,ZEROPLUS
 ADD,VTODO,ATTENDEE,NONE,ZEROPLUS
-ADD,VTODO,CATEGORIES,NONE,ZEROORONE
+ADD,VTODO,CATEGORIES,NONE,ZEROPLUS
 ADD,VTODO,CLASS,NONE,ZEROORONE
 ADD,VTODO,COMMENT,NONE,ZEROORONE
 ADD,VTODO,CONTACT,NONE,ZEROPLUS
@@ -534,7 +534,7 @@ CANCEL,VTODO,DTSTAMP,NONE,ONE
 CANCEL,VTODO,ORGANIZER,NONE,ONE
 CANCEL,VTODO,SEQUENCE,NONE,ONE
 CANCEL,VTODO,ATTACH,NONE,ZEROPLUS
-CANCEL,VTODO,CATEGORIES,NONE,ZEROORONE
+CANCEL,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
 CANCEL,VTODO,CLASS,NONE,ZEROORONE
 CANCEL,VTODO,COMMENT,NONE,ZEROORONE
 CANCEL,VTODO,CONTACT,NONE,ZEROPLUS
@@ -609,7 +609,7 @@ COUNTER,VTODO,PRIORITY,NONE,ONE
 COUNTER,VTODO,SUMMARY,NONE,ONE
 COUNTER,VTODO,UID,NONE,ONE
 COUNTER,VTODO,ATTACH,NONE,ZEROPLUS
-COUNTER,VTODO,CATEGORIES,NONE,ZEROORONE
+COUNTER,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-standard
 COUNTER,VTODO,CLASS,NONE,ZEROORONE
 COUNTER,VTODO,COMMENT,NONE,ZEROORONE
 COUNTER,VTODO,CONTACT,NONE,ZEROPLUS
@@ -646,7 +646,7 @@ DECLINECOUNTER,VTODO,ORGANIZER,NONE,ONE
 DECLINECOUNTER,VTODO,SEQUENCE,NONE,ONE
 DECLINECOUNTER,VTODO,UID,NONE,ONE
 DECLINECOUNTER,VTODO,ATTACH,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,CATEGORIES,NONE,ZEROORONE
+DECLINECOUNTER,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-standard
 DECLINECOUNTER,VTODO,CLASS,NONE,ZEROORONE
 DECLINECOUNTER,VTODO,COMMENT,NONE,ZEROORONE
 DECLINECOUNTER,VTODO,CONTACT,NONE,ZEROPLUS
@@ -683,7 +683,7 @@ PUBLISH,VJOURNAL,DTSTART,NONE,ONE
 PUBLISH,VJOURNAL,ORGANIZER,NONE,ONE
 PUBLISH,VJOURNAL,UID,NONE,ONE
 PUBLISH,VJOURNAL,ATTACH,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,CATEGORIES,NONE,ZEROORONE
+PUBLISH,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard
 PUBLISH,VJOURNAL,CLASS,NONE,ZEROORONE
 PUBLISH,VJOURNAL,COMMENT,NONE,ZEROORONE
 PUBLISH,VJOURNAL,CONTACT,NONE,ZEROPLUS
@@ -715,7 +715,7 @@ ADD,VJOURNAL,ORGANIZER,NONE,ONE
 ADD,VJOURNAL,SEQUENCE,NONE,ONE
 ADD,VJOURNAL,UID,NONE,ONE
 ADD,VJOURNAL,ATTACH,NONE,ZEROPLUS
-ADD,VJOURNAL,CATEGORIES,NONE,ZEROORONE
+ADD,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard
 ADD,VJOURNAL,CLASS,NONE,ZEROORONE
 ADD,VJOURNAL,COMMENT,NONE,ZEROORONE
 ADD,VJOURNAL,CONTACT,NONE,ZEROPLUS
@@ -745,7 +745,7 @@ CANCEL,VJOURNAL,SEQUENCE,NONE,ONE
 CANCEL,VJOURNAL,UID,NONE,ONE
 CANCEL,VJOURNAL,ATTACH,NONE,ZEROPLUS
 CANCEL,VJOURNAL,ATTENDEE,NONE,ZEROPLUS
-CANCEL,VJOURNAL,CATEGORIES,NONE,ZEROORONE
+CANCEL,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard
 CANCEL,VJOURNAL,CLASS,NONE,ZEROORONE
 CANCEL,VJOURNAL,COMMENT,NONE,ZEROORONE
 CANCEL,VJOURNAL,CONTACT,NONE,ZEROPLUS