summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-03-16 22:02:37 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-03-16 22:02:37 (GMT)
commita95d85958dad9b12212b7aba8c339326898192cf (patch)
tree5e13519287ee246f1fc8e39998463b988517c6af
parent7624a2e90fbe128a75923bbc29513cd5bc475e8b (diff)
downloadkeps-a95d85958dad9b12212b7aba8c339326898192cf.tar.gz
Removed x-office and replaced by adr.
-rw-r--r--KEP-0017.txt16
1 files changed, 4 insertions, 12 deletions
diff --git a/KEP-0017.txt b/KEP-0017.txt
index c03a60f..d805dac 100644
--- a/KEP-0017.txt
+++ b/KEP-0017.txt
@@ -1074,16 +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.}}
-====== Office ======
-
- property-assistant = element x-office {
- element text { [[#String]] }
- }
-
-''Additional information related to the office, such as it's location.''
-
-{{note|Implementation note|This property is somewhat redunant to Address but KAddressbook provides it.}}
-
===== URL =====
property-url = element url {
@@ -1123,7 +1113,7 @@ Implements:
element country { [[#String]] }
}
-''An address of the contact.''
+''An address of the contact or organization.''
Address components:
* "pobox": The post office box. This component '''SHOULD NOT''' be used as recommended by {{rfc|6350}}[https://tools.ietf.org/html/rfc6350#section-6.3.1 section-6.3.1].
@@ -1144,6 +1134,8 @@ The "pref" parameter '''MAY''' be used to indicate the preferred address. Only o
The "label" parameter '''MAY''' be used to set a label for the address which client implementations '''SHOULD''' present to the user as primary means for identification of the address.
+If used within an [[#Affiliation]] this property '''SHALL''' be used for any related address, such as an office of the organization. The "label" parameter '''MAY''' be used to store a freeform version of such a location description (i.e. office).
+
Implements:
* {{rfc|6350}} [https://tools.ietf.org/html/rfc6350#section-6.3.1 section-6.3.1]
@@ -1426,7 +1418,7 @@ Implements:
element logo { [[#Logo]] } ?,
element role { [[#Role]] } *,
element related { [[#Related]] } *,
- element x-office { [[#Office]] } *
+ element adr { [[#Address]] } *
} *,
element url { [[#URL]] } *,
element adr { [[#Address]] } *,