[tracker/im] NCO: Improve documentation

[Jürg Billeter <juergbi src gnome org>]

commit 361ef779efcfb8e1b689e0b9ea1efe6511c09e3e
Author: Jürg Billeter <j bitron ch>
Date:   Wed Feb 10 12:15:23 2010 +0100

    NCO: Improve documentation

 data/ontologies/32-nco.ontology |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/data/ontologies/32-nco.ontology b/data/ontologies/32-nco.ontology
index d40f50a..6ca3649 100644
--- a/data/ontologies/32-nco.ontology
+++ b/data/ontologies/32-nco.ontology
@@ -57,7 +57,7 @@ nco:IMAddress a rdfs:Class ;
 # after transition period
 nco:IMAccount a rdfs:Class ;
 	rdfs:label "IMAccount" ;
-	rdfs:comment "An account in an Instant Messaging system. Only user 'me' can have IM Accounts (check hasIMAccount). All other contacts in the address book can come from one (check nco:fromIMAccount). The properties in this class (id, status,...) refers only to 'me'. The specific details of contacts coming from that account are properties of IMContact." ;
+	rdfs:comment "An account in an Instant Messaging system. This refers to IM accounts of the user 'me'." ;
 	tracker:notify true ;
 	rdfs:subClassOf nco:IMAddress .
 
@@ -76,13 +76,13 @@ nco:default-contact-me a nco:PersonContact.
 
 nco:IMContact a rdfs:Class ;
 	rdfs:label "IM Contact" ;
-	rdfs:comment "Contact coming from an IM Account" ;
+	rdfs:comment "Contact coming from an IM Account. This has been deprecated in favor of using nco:PersonContact with nco:hasIMAddress." ;
 	nao:deprecated true ;
 	rdfs:subClassOf nco:PersonContact .
 
 nco:MetaContact a rdfs:Class ;
         rdfs:label "MetaContact" ;
-	rdfs:comment "A metacontact groups PersonContacts and IMContacts coming from different sources, indicating that are the same entity in the real world." ;
+	rdfs:comment "A metacontact groups PersonContacts and IMContacts coming from different sources, indicating that are the same entity in the real world. This has been deprecated in favor of merged contacts. Linking multiple contacts to a single person without merging is the task of pimo:Person and pimo:groundingOccurrence." ;
 	nao:deprecated true ;
 	rdfs:subClassOf rdfs:Resource.
 
@@ -317,14 +317,14 @@ nco:hasIMAccount a rdf:Property ;
 
 nco:fromIMAccount a rdf:Property ;
 	rdfs:label "hasIMAccount" ;
-	rdfs:comment "Indicates that an Instant Messaging account owned by an entity represented by this contact." ;
+	rdfs:comment "Indicates that an Instant Messaging account owned by an entity represented by this contact. This has been replaced by nco:fromIMAccount." ;
 	nao:deprecated true ;
 	rdfs:domain nco:IMContact ;
 	rdfs:range nco:IMAccount .
 
 nco:hasIMContact a rdf:Property ;
 	rdfs:label "hasIMAccount" ;
-	rdfs:comment "Indicates that an Instant Messaging account owned by an entity represented by this contact." ;
+	rdfs:comment "Indicates that this Instant Messaging account has the specified Instant Messaging address in the contact list." ;
 	rdfs:domain nco:IMAccount ;
 	rdfs:range nco:IMAddress .
 
@@ -383,6 +383,8 @@ nco:imID a rdf:Property ;
 
 nco:imAccountAddress a rdf:Property ;
 	a nrl:InverseFunctionalProperty ;
+	rdfs:label "imAccountAddress" ;
+	rdfs:comment "Instant Messaging address of this IM account. The user 'me' can send and receive messages from this IM address." ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain nco:IMAccount ;
 	rdfs:range nco:IMAddress .
@@ -701,7 +703,7 @@ nco:hasAffiliation a rdf:Property ;
 #
 nco:imContactId a rdf:Property ;
 	rdfs:label "imContactId" ;
-	rdfs:comment "ID of the contact in the service like my friend xmail com" ;
+	rdfs:comment "ID of the contact in the service like my friend xmail com  This has been replaced by nco:imId." ;
 	nao:deprecated true ;
 	nrl:maxCardinality 1;
 	rdfs:domain nco:IMContact ;
@@ -709,7 +711,7 @@ nco:imContactId a rdf:Property ;
 
 nco:imContactNickname a rdf:Property ;
 	rdfs:label "imContactNickname" ;
-	rdfs:comment "Visible nickname of the user in a service";
+	rdfs:comment "Visible nickname of the user in a service. This has been replaced by nco:imNickname.";
 	nao:deprecated true ;
 	nrl:maxCardinality 1;
 	rdfs:domain nco:IMContact ;
@@ -717,7 +719,7 @@ nco:imContactNickname a rdf:Property ;
 
 nco:imContactStatusMessage a rdf:Property ;
 	rdfs:label "imContactStatusMessage" ;
-	rdfs:comment "Status message of the user in a service";
+	rdfs:comment "Status message of the user in a service. This has been replaced by nco:imStatusMessage.";
 	nao:deprecated true ;
 	nrl:maxCardinality 1;
 	rdfs:domain nco:IMContact ;
@@ -740,7 +742,7 @@ nco:presence-status-error a nco:PresenceStatus .
 
 nco:imContactPresence a rdf:Property ;
 	rdfs:label "imContactPresence" ;
-	rdfs:comment "Online availability of the user in a service";
+	rdfs:comment "Online availability of the user in a service. This has been replaced by nco:imPresence.";
 	nao:deprecated true ;
 	nrl:maxCardinality 1;
 	rdfs:domain nco:IMContact ;
@@ -770,7 +772,7 @@ nco:im-capability-dbus-tubes a nco:IMCapability .
 
 nco:imContactCapability a rdf:Property ;
 	rdfs:label "imContact Capability";
-	rdfs:comment "Capabilities of an IM Contact, what can we interact with him";
+	rdfs:comment "Capabilities of an IM Contact, what can we interact with him. This has been replaced by nco:imCapability.";
 	nao:deprecated true ;
 	rdfs:domain nco:IMContact ;
 	rdfs:range nco:IMCapability .
@@ -782,5 +784,7 @@ nco:imCapability a rdf:Property ;
 	rdfs:range nco:IMCapability .
 
 nco:hasIMAddress a rdf:Property ;
+	rdfs:label "imAddress";
+	rdfs:comment "An address for communication using instant messages with the object specified by this contact." ;
 	rdfs:domain nco:Role ;
 	rdfs:range nco:IMAddress .