summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-03-16 19:18:49 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-03-16 19:18:49 (GMT)
commit7624a2e90fbe128a75923bbc29513cd5bc475e8b (patch)
tree60dccd71ae203db7d8cc0baa486e913e490ac51e
parentedc418bf2bffc8595fbd1ed8bbb7e6b5e8f424b3 (diff)
downloadkeps-7624a2e90fbe128a75923bbc29513cd5bc475e8b.tar.gz
Got rid of x-manager and x-assistant by using the related property.
This is now possible because we use an affiliation group.
-rw-r--r--KEP-0017.txt33
1 files changed, 7 insertions, 26 deletions
diff --git a/KEP-0017.txt b/KEP-0017.txt
index ac7a56c..c03a60f 100644
--- a/KEP-0017.txt
+++ b/KEP-0017.txt
@@ -1074,26 +1074,6 @@ Implements:
{{note|Possible error in vCard RFC|The reference in the vCard RFC to CCITT.X520.1988:Business Category is likely wrong and should be CCITT.X520.1988:Title. This would align with the example in the vCard RFC and is how we're using it.}}
-====== Manager ======
-
- property-manager = element x-manager {
- element text { [[#String]] }
- }
-
-''Specifies a manager of the contact within the organization.''
-
-{{note|Needs clarification: related|could be expressed using a related property}}
-
-====== Assistant ======
-
- property-assistant = element x-assistant {
- element text { [[#String]] }
- }
-
-''Specifies a manager of the contact within the organization.''
-
-{{note|Needs clarification: related|could be expressed using a related property}}
-
====== Office ======
property-assistant = element x-office {
@@ -1184,7 +1164,7 @@ Implements:
element parameters {
element type {
element text {
- "spouse" | "child"
+ "spouse" | "child" | "x-manager" | "x-assistant"
} +
}?
}?,
@@ -1197,13 +1177,15 @@ Clients SHALL use a [[#UID|uri-uid]] to reference a Contact object when using th
Clients MUST be able to deal with [[#UID|uri-uid]].
Types:
-* "spouse": Specifies that the related contact is the spouse of this contact.
-* "child": Specifies that the related contact is the child of this contact.
+* "spouse": Specifies that the related contact is the spouse of this contact. This value '''SHOULD''' only occur within the toplevel related property.
+* "child": Specifies that the related contact is the child of this contact. This value '''SHOULD''' only occur within the toplevel related property.
+* "x-manager": Specifies a manager of the contact within the organization. This value '''SHOULD''' only occur within related properties within an [[#Affiliation]].
+* "x-assistant": Specifies an assistant of the contact within the organization. This value '''SHOULD''' only occur within related properties within an [[#Affiliation]].
Implements:
* {{rfc|6350}} [https://tools.ietf.org/html/rfc6350#section-6.6.6 section-6.6.6]
-{{note|Needs clarification: manager/assistat|extend for manager and assistant (in which case this should be added to the affiliation group as well? This would obsolete the x-manager x-assistant properties}}
+{{note|Needs clarification: manager/assistat|The two x-values should be submitted to the vCard RFC.}
===== Birthday =====
@@ -1443,8 +1425,7 @@ Implements:
element org { [[#Organization]] },
element logo { [[#Logo]] } ?,
element role { [[#Role]] } *,
- element x-manager { [[#Manager]] } *,
- element x-assistant { [[#Assistant]] } *,
+ element related { [[#Related]] } *,
element x-office { [[#Office]] } *
} *,
element url { [[#URL]] } *,