--- a/ontology/ProvenanceFormalModel.html	Thu Sep 29 13:54:30 2011 +0100
+++ b/ontology/ProvenanceFormalModel.html	Fri Sep 30 10:43:14 2011 +0100
@@ -173,7 +173,8 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#e1"&gt;
-				&lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Entity"/&gt;
+				    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Entity"/&gt;
+				&lt;/rdf:Description&gt;
 			</pre>
 		  </div>		
 		  <div class='note'> e1 is an instance of class Journalist, which is defined to be "sub-class" of class Agent in the CrimeFile ontology and class Agent is defined to be "sub-class" of class Entity. Hence, using standard RDFS entailment allows us to infer that e1 is also an instance of Entity.
@@ -193,7 +194,8 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe2"&gt;
-				&lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#ProcessExecution"/&gt;
+				    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#ProcessExecution"/&gt;
+				&lt;/rdf:Description&gt;
 			</pre>
 		  </div>
 		  <div class='note'> pe2 is an instance of class EmailProcessExecution, which is defined to be "sub-class" of class ProcessExecution in the CrimeFile ontology. Hence, using standard RDFS entailment allows us to infer that pe2 is also an instance of ProcessExecution.
@@ -210,7 +212,8 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#Alice"&gt;
-				&lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Agent"/&gt;
+				    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Agent"/&gt;
+				&lt;/rdf:Description&gt;
 			</pre>
 		  </div>
 		  <div class='note'> Similar to example for Entity, both Alice and Edith are instances of class Journalist, which is defined to be "sub-class" of class Agent in the CrimeFile ontology. Hence, using standard RDFS entailment allows us to infer that both Alice and Edith are also instances of Agent.
@@ -227,7 +230,8 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#t+1"&gt;
-				&lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Time"/&gt;
+				    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Time"/&gt;
+				&lt;/rdf:Description&gt;
 			</pre>
 		  </div>
 	    </section>
@@ -257,12 +261,12 @@
 		  <p> Example of instances of class Location from the <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/ProvenanceModel.html#a-file-scenario"> provenance scenario </a> is the location of the crime file in the shared directory <i>/share</i> with file path <i>/shared/crime.txt</i>. The RDF/XML syntax for asserting that the location of the crime file is the shared directory.		
 		  <div class="exampleOuter">
 			<pre class="example">
-		&lt;cf:hasLocation&gt;
-			&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#sharedDirectoryLocation1"&gt;
-				&lt;cf:hasFilePath rdf:datatype="http://www.w3.org/2001/XMLSchema#string"&gt;/share/crime.txt&lt;/cf:hasFilePath&gt;
-				&lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Location"/&gt;
-			&lt;/rdf:Description&gt;
-		  &lt;/cf:hasLocation&gt;
+            &lt;cf:hasLocation&gt;
+                &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#sharedDirectoryLocation1"&gt;
+                    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Location"/&gt;
+                    &lt;cf:hasFilePath rdf:datatype="http://www.w3.org/2001/XMLSchema#string"&gt;/share/crime.txt&lt;/cf:hasFilePath&gt;
+                &lt;/rdf:Description&gt;
+            &lt;/cf:hasLocation&gt;
 		  </pre>
 	      </div>
 		  <div class='note'> Need to clarify whether "geographic" includes "geospatial"?
@@ -278,7 +282,8 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#Alice"&gt;
-				&lt;cf:assumesRole rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#author"/&gt;
+				    &lt;cf:assumesRole rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#author"/&gt;
+				&lt;/rdf:Description&gt;
 			</pre>
 		  </div>
 		  <div class='issue'>start to use Role + assumedBy as the controller of a process execution? -dg</div>
@@ -297,14 +302,16 @@
 		  <p> Example of wasGeneratedBy property from the <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/ProvenanceModel.html#a-file-scenario"> provenance scenario </a> is <i>e1 wasGeneratedBy pe0</i>. The RDF/XML syntax for asserting this is given below.		
 		  <div class="exampleOuter">
 			<pre class="example">
-				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#e1"&gt;
-				    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#CrimeFile"/&gt;
-				    &lt;cf:isGeneratedBy&gt;
-				    	&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe0"&gt;
-							&lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#FileCreation"/&gt;
-						&lt;/rdf:Description&gt;
-					&lt;cf:isGeneratedBy&gt;
-				&lt;/rdf:Description&gt;	
+                &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#e1"&gt;
+                    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Entity"/&gt;
+                    &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#CrimeFile"/&gt;
+                    &lt;prov:wasGeneratedBy&gt;
+                        &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe0"&gt;
+                            &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#ProcessExecution"/&gt;
+                            &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#FileCreation"/&gt;
+                        &lt;/rdf:Description&gt;
+                    &lt;prov:wasGeneratedBy&gt;
+                &lt;/rdf:Description&gt;    
 			</pre>
 		  </div>
 	    </section>
@@ -317,7 +324,7 @@
 			<div class="exampleOuter">
 				<pre class="example">
 					&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#e3"&gt;
-					    &lt;cf:isDerivedFrom rdf:resource="http://www.w3.org/PROV/CrimeFile#e2"/&gt;
+					    &lt;prov:wasDerivedFrom rdf:resource="http://www.w3.org/PROV/CrimeFile#e2"/&gt;
 					&lt;/rdf:Description&gt;	
 				</pre>
 			</div>
@@ -340,7 +347,7 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe2"&gt;
-				  	&lt;cf:Used rdf:resource="http://www.w3.org/PROV/CrimeFile#e2"/&gt;
+				  	&lt;prov:used rdf:resource="http://www.w3.org/PROV/CrimeFile#e2"/&gt;
 				  &lt;/rdf:Description&gt;	
 			</pre>
 		  </div>
@@ -364,11 +371,11 @@
 		  <div class="exampleOuter">
 			<pre class="example">
 				&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe1"&gt;
-				  &lt;cf:isControlledBy&gt;
+				  &lt;prov:wasControlledBy&gt;
 				    &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#Bob"&gt;
 				      &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#Journalist"/&gt;
 				    &lt;/rdf:Description&gt;
-				  &lt;/cf:isControlledBy&gt;
+				  &lt;/prov:wasControlledBy&gt;
 				&lt;/rdf:Description&gt;	
 			</pre>
 		  </div>
@@ -450,38 +457,41 @@
 		<p>Example given below describes the provenance of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/ontology/ProvenanceFormalModel.html#entity">Entity</a> e2 using RDF/XML syntax
 		<div class="exampleOuter">
 				<pre class="example">
-				&lt;?xml version="1.0"?&gt;
-				&lt;rdf:RDF
-				    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-				    xmlns:prov="http://www.w3.org/PROV/ProvenanceOntology.owl#"
-				    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-				    xmlns:cf="http://www.w3.org/PROV/CrimeFileOntology.owl#"&gt; 
+                &lt;?xml version="1.0"?&gt;
+                &lt;rdf:RDF
+                    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+                    xmlns:prov="http://www.w3.org/PROV/ProvenanceOntology.owl#"
+                    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+                    xmlns:cf="http://www.w3.org/PROV/CrimeFileOntology.owl#"&gt; 
 
-				    &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#e2"&gt;
-					  &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#CrimeFile"/&gt;
-					  &lt;prov:wasGeneratedBy&gt;
-					  &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe1"&gt;
-						&lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#FileAppending"/&gt;
-						&lt;prov:wasControlledBy&gt;
-							&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#Bob"&gt;
-								&lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#Journalist"/&gt;
-							&lt;/rdf:Description&gt;
-						&lt;/prov:wasControlledBy&gt;						
-					  &lt;/rdf:Description&gt;
-					  &lt;/prov:wasGeneratedBy&gt;
-					  &lt;prov:wasDerivedFrom rdf:resource="http://www.w3.org/PROV/CrimeFile#e1"/&gt;
-					  &lt;cf:hasLocation&gt;
-						&lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#sharedDirectoryLocation1"&gt;
-							&lt;cf:hasFilePath rdf:datatype="http://www.w3.org/2001/XMLSchema#string"&gt;/share/crime.txt&lt;/cf:hasFilePath&gt;
-							&lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Location"/&gt;
-						&lt;/rdf:Description&gt;
-					  &lt;/cf:hasLocation&gt; 
-					  &lt;cf:hasFileContent rdf:datatype="http://www.w3.org/2001/XMLSchema#string"&gt;There was a lot of crime in London last month.&lt;/cf:hasFileContent&gt;				 
-				     &lt;/rdf:Description&gt;
-					 &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe2"&gt;
-					   &lt;prov:Used rdf:resource="http://www.w3.org/PROV/CrimeFile#e2"/&gt;
-				     &lt;/rdf:Description&gt;
-				  &lt;/rdf:RDF&gt;
+                    &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#e2"&gt;
+                      &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Entity"/&gt;
+                      &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#CrimeFile"/&gt;
+                      &lt;prov:wasGeneratedBy&gt;
+                      &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe1"&gt;
+                          &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#ProcessExecution"/&gt;
+                          &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#FileAppending"/&gt;
+                          &lt;prov:wasControlledBy&gt;
+                            &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#Bob"&gt;
+                                &lt;rdf:type rdf:resource="http://www.w3.org/PROV/CrimeFileOntology.owl#Journalist"/&gt;
+                            &lt;/rdf:Description&gt;
+                          &lt;/prov:wasControlledBy&gt;                        
+                      &lt;/rdf:Description&gt;
+                      &lt;/prov:wasGeneratedBy&gt;
+                      &lt;prov:wasDerivedFrom rdf:resource="http://www.w3.org/PROV/CrimeFile#e1"/&gt;
+                      &lt;cf:hasLocation&gt;
+                          &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#sharedDirectoryLocation1"&gt;
+                              &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#Location"/&gt;
+                              &lt;cf:hasFilePath rdf:datatype="http://www.w3.org/2001/XMLSchema#string"&gt;/share/crime.txt&lt;/cf:hasFilePath&gt;
+                          &lt;/rdf:Description&gt;
+                      &lt;/cf:hasLocation&gt; 
+                      &lt;cf:hasFileContent rdf:datatype="http://www.w3.org/2001/XMLSchema#string"&gt;There was a lot of crime in London last month.&lt;/cf:hasFileContent&gt;                 
+                     &lt;/rdf:Description&gt;
+                     &lt;rdf:Description rdf:about="http://www.w3.org/PROV/CrimeFile#pe2"&gt;
+                         &lt;rdf:type rdf:resource="http://www.w3.org/PROV/ProvenanceOntology.owl#ProcessExecution"/&gt;
+                         &lt;prov:used rdf:resource="http://www.w3.org/PROV/CrimeFile#e2"/&gt;
+                     &lt;/rdf:Description&gt;
+                  &lt;/rdf:RDF&gt;
 			</pre>
 			</div> 
 		</p>