2 commits - KEP-0017.txt
Christian Mollekopf
mollekopf at kolabsys.com
Wed Apr 24 19:15:47 CEST 2013
KEP-0017.txt | 85 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 51 insertions(+), 34 deletions(-)
New commits:
commit 908cf7b1805a95e373f1b123652533eefa6fb52e
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Wed Apr 24 19:14:00 2013 +0200
Reflect that the attachment property isn't exactly the same in xcal and the special kolab objects.
diff --git a/KEP-0017.txt b/KEP-0017.txt
index e286b60..02ae31b 100644
--- a/KEP-0017.txt
+++ b/KEP-0017.txt
@@ -187,6 +187,44 @@ Implements:
{{note|Hierarchical Categories|See [[#Hierarchical Categories]] for a specification of the deprecated hierarchical categories as used by Kontact}}
+==== Attachment ====
+
+ kolab-property-attach = element attach {
+ element parameters {
+ element fmttype { [[#String]] },
+ element x-label { [[#String]] } ?,
+ element encoding { "BASE64" } ?
+ },
+ element uri { [[#URI]] } |
+ element binary { [[#String]] }
+ }
+
+ xcal-property-attach = element attach {
+ element parameters {
+ element fmttype { element text { [[#String]] } },
+ element x-label { element text { [[#String]] } } ?,
+ element encoding { element text { "BASE64" } } ?
+ },
+ element uri { [[#URI]] } |
+ element binary { [[#String]] }
+ }
+
+''A file attachment.''
+
+The attachment '''MUST''' either be referenced using the uri element or embedded using the binary element.
+
+* "fmttype": '''MUST''' be set to the mimetype of the file.
+* "x-label": '''MAY''' be used to add a user visible label for the attachment (such as the filename).
+* "encoding": '''MUST''' be set to "BASE64" for inline encoding. This parameter '''MUST''' be set if inline storage using the binary element is used.
+
+The binary content '''MUST''' be "Base 64"-encoded according to {{rfc|4648}}<ref name=rfc4648>{{rfc|4648|The Base16, Base32, and Base64 Data Encodings}}</ref>[https://tools.ietf.org/html/rfc4648#section-4 section-4]
+
+Implements:
+* {{rfc|5545}} [https://tools.ietf.org/html/rfc5545#section-3.8.1.1 section-3.8.1.1]
+
+{{note|Attachments in separate Mimeparts|Attachments '''SHOULD''' be attached using a seperate Mime-Part. If this technique is used the Attachment '''MUST''' be referenced using the Content-Id(cid:) of the Mimepart in the uri element.}}
+{{note|x-label|This property should be replaced with something standard compliant or added to the official standard.}}
+
=== xCal based objects ===
element icalendar {
@@ -685,33 +723,6 @@ Implements:
{{note|cal-address|The cal-address would allow for any uri, it was restricted to keep clients from having to handle arbitrary contact mediums.}}
{{note|cutype|"UNKNOWN" and "ROOM" were added for RFC compatibility reasons.}}
-===== Attachment =====
-
- property-attach = element attach {
- element parameters {
- element fmttype { element text { [[#String]] } },
- element x-label { element text { [[#String]] } } ?,
- element encoding { element text { "BASE64" } } ?
- },
- element uri { [[#URI|xsd:anyURI]] } |
- element binary { [[#String|xsd:string]] }
- }
-
-''A file attachment.''
-
-The attachment '''MUST''' either be referenced using the uri element or embedded using the binary element.
-
-* "fmttype": '''MUST''' be set to the mimetype of the file.
-* "x-label": '''MAY''' be used to add a user visible label for the attachment (such as the filename).
-* "encoding": '''MUST''' be set to "BASE64" for inline encoding. This parameter '''MUST''' be set if inline storage using the binary element is used.
-
-The binary content '''MUST''' be "Base 64"-encoded according to {{rfc|4648}}<ref name=rfc4648>{{rfc|4648|The Base16, Base32, and Base64 Data Encodings}}</ref>[https://tools.ietf.org/html/rfc4648#section-4 section-4]
-
-Implements:
-* {{rfc|5545}} [https://tools.ietf.org/html/rfc5545#section-3.8.1.1 section-3.8.1.1]
-
-{{note|Attachments in separate Mimeparts|Attachments '''SHOULD''' be attached using a seperate Mime-Part. If this technique is used the Attachment '''MUST''' be referenced using the Content-Id(cid:) of the Mimepart in the uri element.}}
-{{note|x-label|This property should be replaced with something standard compliant or added to the official standard.}}
===== Freebusy Property =====
@@ -795,7 +806,7 @@ Properties:
type-audioprop = element properties {
element action { text { "AUDIO" } },
- element attach { [[#Attachment]] } ?
+ element attach { [[#Attachment|xcal-property-attach]] } ?
property-trigger,
(
element duration { [[#Duration]] },
@@ -860,7 +871,7 @@ Implements:
element organizer { [[#Organizer]] } ?
element url { [[#Object URL]] } ?,
element attendee { [[#Attendee]] } *,
- element attach { [[#Attachment]] } *,
+ element attach { [[#Attachment|xcal-property-attach]] } *,
element x-custom { [[#Kolab Custom Property]] } *
},
element components {
@@ -904,7 +915,7 @@ Implements:
element organizer { [[#Organizer]] } ?
element url { [[#Object URL]] } ?,
element attendee { [[#Attendee]] } *,
- element attach { [[#Attachment]] } *,
+ element attach { [[#Attachment|xcal-property-attach]] } *,
element x-custom { [[#Kolab Custom Property]] } *
},
element components {
@@ -937,7 +948,7 @@ Implements:
element description { [[#Description]] } ?,
element status { [[#Status]] } ?,
element attendee { [[#Attendee]] } *,
- element attach { [[#Attachment]] } *,
+ element attach { [[#Attachment|xcal-property-attach]] } *,
element x-custom { [[#Kolab Custom Property]] } *
}
}
@@ -1558,7 +1569,7 @@ The vcard:kind element '''MUST''' have the value "group".
element last-modification-date { [[#Last modification date|value-lastmodified-date]] },
element categories { [[#Categories|value-category]] } *,
element classification { [[#Classification|value-classification]] } ?,
- element attachment { [[#Attachment]] } *,
+ element attachment { [[#Attachment|kolab-property-attach]] } *,
element summary { [[#String]] } ?,
element description { [[#String]] } ?,
element x-custom { [[#Kolab Custom Property]]} *
@@ -1581,7 +1592,7 @@ The vcard:kind element '''MUST''' have the value "group".
element last-modification-date { [[#Last modification date|value-lastmodified-date]] },
element categories { [[#Categories|value-category]] } *,
element classification { [[#Classification|value-classification]] } ?,
- element file { [[#Attachment]] },
+ element file { [[#Attachment|kolab-property-attach]] },
element note { [[#String]] } ?,
element x-custom { [[#Kolab Custom Property]]} *
}
commit 44b444e03270faeb1fe4f020e131ca718329a790
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Wed Apr 24 18:58:15 2013 +0200
email type.
diff --git a/KEP-0017.txt b/KEP-0017.txt
index ba4499c..e286b60 100644
--- a/KEP-0017.txt
+++ b/KEP-0017.txt
@@ -1375,7 +1375,10 @@ Implements:
===== EMail =====
property-email = element email {
- element parameters { element pref { element integer { 1 } } } ?,
+ element parameters {
+ element pref { element integer { 1 } } ?,
+ element type { element text { "work" | "home" } } *
+ } ?,
element text { [[#String]] }
}
@@ -1384,6 +1387,9 @@ Implements:
The text value '''SHOULD''' be interpreted as addr-spec according to {{rfc|5322}}<ref name="rfc5322">{{rfc|5322}} Internet Message Format</ref> [https://tools.ietf.org/html/rfc5322#section-3.4.1].
The "pref" parameter '''MAY''' be used to indicate the preferred email address. Only one email address '''SHOULD''' be marked as preferred address.
+The "type" parameter '''MAY''' be used to indicate the type of the email address.
+* "work": indicates the email address is work related
+* "home": indicates the email address is a private email address
Implements:
* {{rfc|6350}} [https://tools.ietf.org/html/rfc6350#section-6.4.2 section-6.4.2]
More information about the commits
mailing list