Index: design-data/restrictions.csv
===================================================================
--- design-data/restrictions.csv	(revision 1157)
+++ design-data/restrictions.csv	(working copy)
@@ -323,16 +323,16 @@
 PUBLISH,VFREEBUSY,DTSTAMP,NONE,ONE
 PUBLISH,VFREEBUSY,DTSTART,NONE,ONE
 PUBLISH,VFREEBUSY,DTEND,NONE,ONE
-PUBLISH,VFREEBUSY,FREEBUSY,NONE,ONEPLUS
+PUBLISH,VFREEBUSY,FREEBUSY,NONE,ZEROPLUS
 PUBLISH,VFREEBUSY,ORGANIZER,NONE,ONE
-PUBLISH,VFREEBUSY,COMMENT,NONE,ZEROORONE
-PUBLISH,VFREEBUSY,CONTACT,NONE,ZEROPLUS
+PUBLISH,VFREEBUSY,COMMENT,NONE,ZEROPLUS
+PUBLISH,VFREEBUSY,CONTACT,NONE,ZEROORONE
 PUBLISH,VFREEBUSY,X,NONE,ZEROPLUS
 PUBLISH,VFREEBUSY,URL,NONE,ZEROORONE
 PUBLISH,VFREEBUSY,ATTENDEE,NONE,ZERO
 PUBLISH,VFREEBUSY,DURATION,NONE,ZERO
 PUBLISH,VFREEBUSY,REQUESTSTATUS,NONE,ZERO
-PUBLISH,VFREEBUSY,UID,NONE,ZEROORONE
+PUBLISH,VFREEBUSY,UID,NONE,ONE
 PUBLISH,VFREEBUSY,NONE,X,ZEROPLUS
 PUBLISH,VFREEBUSY,NONE,VEVENT,ZERO
 PUBLISH,VFREEBUSY,NONE,VTODO,ZERO
@@ -346,8 +346,8 @@
 REQUEST,VFREEBUSY,DTSTART,NONE,ONE
 REQUEST,VFREEBUSY,ORGANIZER,NONE,ONE
 REQUEST,VFREEBUSY,UID,NONE,ONE
-REQUEST,VFREEBUSY,COMMENT,NONE,ZEROORONE
-REQUEST,VFREEBUSY,CONTACT,NONE,ZEROPLUS
+REQUEST,VFREEBUSY,COMMENT,NONE,ZEROPLUS
+REQUEST,VFREEBUSY,CONTACT,NONE,ZEROORONE
 REQUEST,VFREEBUSY,X,NONE,ZEROPLUS
 REQUEST,VFREEBUSY,FREEBUSY,NONE,ZERO
 REQUEST,VFREEBUSY,DURATION,NONE,ZERO
@@ -364,11 +364,11 @@
 REPLY,VFREEBUSY,DTSTAMP,NONE,ONE
 REPLY,VFREEBUSY,DTEND,NONE,ONE
 REPLY,VFREEBUSY,DTSTART,NONE,ONE
-REPLY,VFREEBUSY,FREEBUSY,NONE,ONEPLUS
+REPLY,VFREEBUSY,FREEBUSY,NONE,ZEROPLUS
 REPLY,VFREEBUSY,ORGANIZER,NONE,ONE
 REPLY,VFREEBUSY,UID,NONE,ONE
-REPLY,VFREEBUSY,COMMENT,NONE,ZEROORONE
-REPLY,VFREEBUSY,CONTACT,NONE,ZEROPLUS
+REPLY,VFREEBUSY,COMMENT,NONE,ZEROPLUS
+REPLY,VFREEBUSY,CONTACT,NONE,ZEROORONE
 REPLY,VFREEBUSY,REQUESTSTATUS,NONE,ZEROPLUS
 REPLY,VFREEBUSY,URL,NONE,ZEROORONE
 REPLY,VFREEBUSY,X,NONE,ZEROPLUS
@@ -1041,10 +1041,10 @@
 NONE,VFREEBUSY,CREATED,NONE,ZERO
 NONE,VFREEBUSY,DESCRIPTION,NONE,ZERO
 NONE,VFREEBUSY,DTEND,NONE,ZEROORONE
-NONE,VFREEBUSY,DTSTAMP,NONE,ZERO
+NONE,VFREEBUSY,DTSTAMP,NONE,ONE
 NONE,VFREEBUSY,DTSTART,NONE,ZEROORONE
 NONE,VFREEBUSY,DUE,NONE,ZERO
-NONE,VFREEBUSY,DURATION,NONE,ZEROORONE
+NONE,VFREEBUSY,DURATION,NONE,ZERO
 NONE,VFREEBUSY,EXDATE,NONE,ZERO
 NONE,VFREEBUSY,EXRULE,NONE,ZERO
 NONE,VFREEBUSY,FREEBUSY,NONE,ZEROPLUS
@@ -1073,7 +1073,7 @@
 NONE,VFREEBUSY,TZOFFSETFROM,NONE,ZERO
 NONE,VFREEBUSY,TZOFFSETTO,NONE,ZERO
 NONE,VFREEBUSY,TZURL,NONE,ZERO
-NONE,VFREEBUSY,UID,NONE,ZEROORONE
+NONE,VFREEBUSY,UID,NONE,ONE
 NONE,VFREEBUSY,URL,NONE,ZEROORONE
 NONE,VFREEBUSY,VERSION,NONE,ZERO
 NONE,VFREEBUSY,X,NONE,ZEROPLUS