--- a/ontology/components/wasInformedBy.ttl	Mon Nov 21 08:55:12 2011 -0500
+++ b/ontology/components/wasInformedBy.ttl	Mon Nov 21 09:59:47 2011 -0500
@@ -11,9 +11,9 @@
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
    rdfs:domain prov:ProcessExecution;
    rdfs:range  prov:ProcessExecution;
+   rdfs:comment "A representation that an entity was generated by an activity, before it was used by another activity.";
 
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
-   rdfs:comment "Given two process execution expressions identified by pe1 and pe2, the expression wasInformedBy(pe2,pe1) holds, if and only if there is an entity expression identified by e and qualifiers q1 and q2, such that wasGeneratedBy(e,pe1,q1) and used(pe2,e,q2) hold.";
    # This is too unconstrained: owl:propertyChainAxiom ( prov:used prov:wasGeneratedBy prov:qualifiedGeneration prov:entity );
    rdfs:comment "The relationship wasInformedBy is not transitive.";
 .
@@ -29,6 +29,7 @@
       prov:time "2011-11-16T17:35:59-05:00"^^xsd:dateTime;
    ];
 .
+
 :web_page_view
    a prov:Entity;
    prov:viewOf <http://dvcs.w3.org/hg/prov/raw-file/default/model/ProvenanceModel.html#record-OrderingOfActivities>;
@@ -42,4 +43,11 @@
    owl:targetIndividual    owl:TransitiveProperty;
 
    prov:wasDerivedFrom :wasInformedBy_not_transitive_narrative;
+   prov:wasGeneratedBy :narrative_to_axiom;
 .
+
+:narrative_to_axiom
+   a prov:ProcessExecution;
+   prov:generated :was:informedBy_not_transitive_axiom;
+   prov:wasControlledBy <http://purl.org/twc/id/person/TimLebo>;
+.

Binary file ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.png has changed

--- a/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl	Mon Nov 21 08:55:12 2011 -0500
+++ b/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl	Mon Nov 21 09:59:47 2011 -0500
@@ -9,34 +9,19 @@
 @prefix app: <http://www.w3.org/TR/2011/WD-prov-dm-20111018/app#> .
 @prefix :    <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#> .
 
-:pe2
-<<<<<<< local
-<<<<<<< local
-=======
->>>>>>> other
+:a2
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>,
-<<<<<<< local
                 <http://dvcs.w3.org/hg/prov/raw-file/default/model/ProvenanceModel.html#record-OrderingOfActivities>,
                 <https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.png>;
-=======
-                <http://dvcs.w3.org/hg/prov/raw-file/default/model/ProvenanceModel.html#record-OrderingOfActivities>;
->>>>>>> other
-   dcterms:description
-"""Given two activity records identified by pe1 and pe2, the record wasInformedBy(pe2,pe1) holds, if and only if there is an entity record identified by e and sets of attribute-value pairs attrs1 and attrs2, such that wasGeneratedBy(e,pe1,attrs1) and used(pe2,e,attrs2) hold.""";
+   dcterms:description "Given two activity records identified by a1 and a2, the record wasInformedBy(a2,a1) holds, if and only if there is an entity record identified by e and sets of attribute-value pairs attrs1 and attrs2, such that wasGeneratedBy(e,a1,attrs1) and used(a2,e,attrs2) hold.";
 
-<<<<<<< local
-=======
+   dcterms:description "wasInformedBy(a2,a1)";
+   prov:wasInformedBy :a1;
+   a prov:ProcessExecution;
+.
+:a1
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
->>>>>>> other
-=======
->>>>>>> other
-   dcterms:description "wasInformedBy(pe2,pe1)";
-   a prov:ProcessExecution;
-   prov:wasInformedBy :pe1;
-.
-:pe1
-   rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
-   dcterms:description "wasInformedBy(pe2,pe1)";
+   dcterms:description "wasInformedBy(a2,a1)";
    a prov:ProcessExecution;
 .
 
@@ -44,34 +29,32 @@
  
 :e
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
-   dcterms:description "wasGeneratedBy(e,pe1,q1)";
+   dcterms:description "wasGeneratedBy(e,a1,attrs1)";
    a prov:Entity;
-   prov:wasGeneratedBy :pe1;
+   prov:wasGeneratedBy :a1;
 .
-:pe1
+:a1
    a prov:ProcessExecution;
    prov:generated :e;
    prov:qualifiedGeneration [
       a prov:Generation;
       prov:hadQualifiedEntity :e;
-      rdfs:comment "attrs1: Some addition triples should be here, but are not provided by the PROV-DM example.";
-      :attrs_1a "a";
-      :attrs_1b "b";
+      :attrs1_a "1a";
+      :attrs1_b "1b";
    ];
 .
-
-:pe2
+:a2
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
-   dcterms:description "used(pe2,e,q2)";
+   dcterms:description "used(a2,e,attrs2)";
    a prov:ProcessExecution;
    prov:used :e;
    prov:qualifedUsage [
       a prov:Usage;
       prov:hadQualifiedEntity :e;
       rdfs:comment "attrs2: Some addition triples should be here, but are not provided by the PROV-DM example.";
-      :attrs_2a "a";
-      :attrs_2b "b";
+      :attrs2_a "2a";
+      :attrs2_b "2b";
    ];
 .
-
-<https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.png> prov:wasDerivedFrom <https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl> .
+<https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.png> 
+   prov:wasDerivedFrom <https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl> .