spec: adjust to ontology

Ontology merged, sync

Author: DylanVanAssche

spec/section/abstract.md

@@ -14,4 +14,4 @@ and is therefore not limited to a specific set of targets or data sources.
 The current document describes the Logical Source and Logical Target concepts 
 through definitions and examples.
 
-The version of this document is *v1.3*.
+The version of this document is *DRAFT*.

spec/section/logical-source-in-rml.md

@@ -1,7 +1,7 @@
 ## Logical Source in RML {#logical-source-in-rml}
 
 RML is aligned with the Logical Source vocabulary 
-by extending `rr:TriplesMap` with the `rml:logicalSource` property 
+by extending `rml:TriplesMap` with the `rml:logicalSource` property 
 to describe on Triples Map [[RML]] level where the data must be retrieved
 from and where the references refer to.
 A Triples Map is a function that generates an RDF triples 
@@ -13,7 +13,7 @@ RDF triples.
 
 | Property            | Domain          | Range                |
 | ------------------- | ------------    | -------------------- |
-| `rml:logicalSource` | `rr:TriplesMap` | `rml:LogicalSource`  |
+| `rml:logicalSource` | `rml:TriplesMap` | `rml:LogicalSource`  |
 
 In the example below, a CSV file is transformed into a knowledge graph.
 The CSV file is accessed using the [[CSVW]] vocabulary,
@@ -42,27 +42,27 @@ id;name;nickname
 <pre class="ex-mapping">
 @base &lt;http://example.com/ns#&gt; .
 
-&lt;#TriplesMap&gt; a rr:TriplesMap;
+&lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#CSVSourceAccess&gt;;
   ];
-  rr:subjectMap [ a rr:SubjectMap;
-    rr:template "http://example.com/{id}";
-    rr:class foaf:Person;
+  rml:subjectMap [ a rml:SubjectMap;
+    rml:template "http://example.com/{id}";
+    rml:class foaf:Person;
   ];
-  rr:predicateObjectMap [ a rr:PredicateObjectMap;
-    rr:predicateMap [ a rr:PredicateMap;
-      rr:constant foaf:name;
+  rml:predicateObjectMap [ a rml:PredicateObjectMap;
+    rml:predicateMap [ a rml:PredicateMap;
+      rml:constant foaf:name;
     ];
-    rr:objectMap [ a rr:ObjectMap;
+    rml:objectMap [ a rml:ObjectMap;
       rml:reference "name";
     ];
   ];
-  rr:predicateObjectMap [ a rr:PredicateObjectMap;
-    rr:predicateMap [ a rr:PredicateMap;
-      rr:constant foaf:nickname;
+  rml:predicateObjectMap [ a rml:PredicateObjectMap;
+    rml:predicateMap [ a rml:PredicateMap;
+      rml:constant foaf:nickname;
     ];
-    rr:objectMap [ a rr:ObjectMap;
+    rml:objectMap [ a rml:ObjectMap;
       rml:reference "nickname";
     ];
   ];

spec/section/logical-target-in-rml.md

@@ -1,7 +1,7 @@
 ## Logical Target in RML {#logical-target-in-rml}
 
 RML is aligned with the Logical Target vocabulary 
-by extending `rr:TermMap` with the `rml:logicalTarget` property 
+by extending `rml:TermMap` with the `rml:logicalTarget` property 
 to describe on Term Map [[RML]] level where each triple must be directed to. 
 A Term Map is a function that generates an RDF term 
 from a logical reference [[RML]].
@@ -31,7 +31,7 @@ are exported to the default target of the processor.
 
 | Property            | Domain       | Range                |
 | ------------------- | ------------ | -------------------- |
-| `rml:logicalTarget` | `rr:TermMap` | `rml:LogicalTarget` |
+| `rml:logicalTarget` | `rml:TermMap` | `rml:LogicalTarget` |
 
 In the example below, a CSV file is transformed into a knowledge graph.
 The CSV file is accessed using the [[CSVW]] vocabulary,
@@ -66,29 +66,29 @@ id;name;nickname
 <pre class="ex-mapping">
 @base &lt;http://example.com/ns#&gt; .
 
-&lt;#TriplesMap&gt; a rr:TriplesMap;
+&lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#CSVSourceAccess&gt;;
   ];
-  rr:subjectMap [ a rr:SubjectMap;
-    rr:template "http://example.com/{id}";
+  rml:subjectMap [ a rml:SubjectMap;
+    rml:template "http://example.com/{id}";
     rml:logicalTarget &lt;#TargetDump1&gt;;
-    rr:class foaf:Person;
+    rml:class foaf:Person;
   ];
-  rr:predicateObjectMap [ a rr:PredicateObjectMap;
-    rr:predicateMap [ a rr:PredicateMap;
-      rr:constant foaf:name;
+  rml:predicateObjectMap [ a rml:PredicateObjectMap;
+    rml:predicateMap [ a rml:PredicateMap;
+      rml:constant foaf:name;
       rml:logicalTarget &lt;#TargetDump2&gt;;
     ];
-    rr:objectMap [ a rr:ObjectMap;
+    rml:objectMap [ a rml:ObjectMap;
       rml:reference "name";
     ];
   ];
-  rr:predicateObjectMap [ a rr:PredicateObjectMap;
-    rr:predicateMap [ a rr:PredicateMap;
-      rr:constant foaf:nickname;
+  rml:predicateObjectMap [ a rml:PredicateObjectMap;
+    rml:predicateMap [ a rml:PredicateMap;
+      rml:constant foaf:nickname;
     ];
-    rr:objectMap [ a rr:ObjectMap;
+    rml:objectMap [ a rml:ObjectMap;
       rml:reference "nickname";
     ];
   ];
@@ -104,7 +104,7 @@ id;name;nickname
 &lt;#TargetDump2&gt; a rml:LogicalTarget;
   rml:target &lt;#VoIDDump2&gt;;
   rml:serialization formats:Turtle;
-  rml:compression comp:zip;
+  rml:compression rml:zip;
 .
 </pre>