merged
authorStian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk>
Tue, 21 Feb 2012 11:25:43 +0000
changeset 1630 f2ce339343b3
parent 1629 1357fcf3efbf (current diff)
parent 1628 80492e77812c (diff)
child 1631 e5f16b3e3be2
merged
--- a/model/working-copy/glossary.js	Tue Feb 21 11:25:33 2012 +0000
+++ b/model/working-copy/glossary.js	Tue Feb 21 11:25:43 2012 +0000
@@ -3,7 +3,7 @@
 //  with <script src="glossary.js" class="remove"></script>
 //Insert glossary definitions with the following 
 // <div class="glossary-ref" ref="glossary-generation"></div>
-glossary_hg='http://dvcs.w3.org/hg/prov/file/0523d130a6d7/model/working-copy/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/d711911bfb6a/model/working-copy/glossary.html';
 glossary_string= 
 ' ' + 
 '<html> ' + 
--- a/model/working-copy/towards-wd4.html	Tue Feb 21 11:25:33 2012 +0000
+++ b/model/working-copy/towards-wd4.html	Tue Feb 21 11:25:43 2012 +0000
@@ -383,8 +383,7 @@
 
 <div class="anexample" id="agent-example">
 <p>
-For
- example, software for checking the use of grammar in a document may be defined as an agent of a document preparation activity, and at the same time one can describe its provenance, including for instance the vendor and the version history.</p>
+Software for checking the use of grammar in a document may be defined as an agent of a document preparation activity, and at the same time one can describe its provenance, including for instance the vendor and the version history.</p>
 </div>
 </section>
 
@@ -407,18 +406,20 @@
 
 
 
-<div class="anexample" id="generation-usage-example">
-<p>Examples of generation are the completed creation of a file by a
+<p><div class="anexample" id="generation-example">
+Examples of generation are the completed creation of a file by a
 program, the completed creation of a linked data set, and the completed
-publication of a new version of a document.</p>
-
-
-<p>Usage examples include a procedure beginning to consume an argument, a service starting to read a value on a port, a program beginning to read a configuration
+publication of a new version of a document.
+</div>
+</p>
+
+<p>
+<div class="anexample" id="usage-example">
+Usage examples include a procedure beginning to consume an argument, a service starting to read a value on a port, a program beginning to read a configuration
 file, or the point at which an ingredient, such as eggs, is being added in a baking activity. Usage may entirely consume an entity (e.g. eggs are no longer available after being added to
-the mix); alternatively, a same entity may be used multiple times, possibly by different activities (e.g. a file on a file system can be read indefinitely).</p>
-
-    
-</div>
+the mix); alternatively, a same entity may be used multiple times, possibly by different activities (e.g. a file on a file system can be read indefinitely).
+</div></p>
+
 
 <p>Activities are consumers of entities and producers of entities. In some case, the consumption of an entity influences the creation of another in some way. This notion is captured by derivations, defined as follows.</p>
 
@@ -790,7 +791,7 @@
 <div class="glossary-ref" ref="glossary-entity" withspan='true'></div>
 
 
-<p><div class="attributes-entity">An entity<span class="withAsn">, written <span class="name">entity(id, [ attr1=val1, ...])</span> in PROV-ASN, </span> contains:</p>
+<p><div class="attributes" id="attributes-entity">An entity<span class="withAsn">, written <span class="name">entity(id, [ attr1=val1, ...])</span> in PROV-ASN, </span> contains:</p>
 <ul>
 <li><em>id</em>: an identifier identifying an entity; </li>
 <li><em>attributes</em>: an OPTIONAL set of attribute-value pairs representing this entity's situation in the world.</li>
@@ -842,7 +843,7 @@
 
 <div class="glossary-ref" ref="glossary-activity" withspan='true'></div>
 
-<p><div class="attributes-activity"> An activity<span class="withAsn">, written <span class="name">activity(id, st, et, [ attr1=val1, ...])</span> in PROV-ASN,</span> contains:</p>
+<p><div class="attributes" id="attributes-activity"> An activity<span class="withAsn">, written <span class="name">activity(id, st, et, [ attr1=val1, ...])</span> in PROV-ASN,</span> contains:</p>
 <ul>
 <li><em>id</em>: an identifier identifying an activity;</li>
 <li><em>startTime</em>: an OPTIONAL time for the start of the activity;</li>
@@ -886,12 +887,12 @@
 <div class="glossary-ref" ref="glossary-agent" withspan='true'></div>
 
 
-<p>An agent<span class="withAsn">, noted <span class="name">agent(id, [ attr1=val1, ...])</span> in PROV-ASN,</span> contains:</p>
+<p><div class="attributes" id="attributes-agent">An agent<span class="withAsn">, noted <span class="name">agent(id, [ attr1=val1, ...])</span> in PROV-ASN,</span> contains:</p>
 <ul>
 <li><em>id</em>: an identifier identifying an agent;</li>
 <li><em>attributes</em>: a set of attribute-value pairs representing this agent's situation in the world.
 </li>
-</ul>
+</ul></div>
 
 
 <p>
@@ -1004,7 +1005,7 @@
 <div class="glossary-ref" ref="glossary-generation" withspan='true'></div>
 
 <p>
-<div class="attributes-generation"><dfn title="dfn-Generation">Generation</dfn><span class="withAsn">, written <span class="name">wasGeneratedBy(id,e,a,t,attrs)</span> in PROV-ASN,</span> has the following components:</p>
+<div class="attributes" id="attributes-generation"><dfn title="dfn-Generation">Generation</dfn><span class="withAsn">, written <span class="name">wasGeneratedBy(id,e,a,t,attrs)</span> in PROV-ASN,</span> has the following components:</p>
 <ul>
 <li><em>id</em>:  an OPTIONAL identifier identifying a generation;</li> 
 <li><em>entity</em>:  an identifier identifying a created entity; </li>
@@ -1054,7 +1055,7 @@
 <div class="glossary-ref" ref="glossary-usage" withspan='true'></div>
 
 
-<p><div class="attributes-generation"><dfn title="dfn-Usage">Usage</dfn><span class="withAsn">, written <span class="name">used(id,a,e,t,attrs)</span> in PROV-ASN,</span> has the following constituents:</p>
+<p><div class="attributes" id="attributes-usage"><dfn title="dfn-Usage">Usage</dfn><span class="withAsn">, written <span class="name">used(id,a,e,t,attrs)</span> in PROV-ASN,</span> has the following constituents:</p>
 <ul>
 <li><em>id</em>:  an OPTIONAL identifier identifying a usage;</li> 
 <li><em>activity</em>: an identifier for the consuming activity;</li>
@@ -1114,7 +1115,7 @@
 href="#term-responsibility">Section Responsibility</a>, is a relation between agents expressing that an agent was acting on behalf of another, in the context of an activity. </p>
 
 
-<p>An <dfn title="dfn-activity-association">activity association</dfn><span class="withAsn">, written <span class="name">wasAssociatedWith(id,a,ag,pl,attrs)</span> in PROV-ASN,</span> has the following
+<p><div class="attributes" id="attributes-activity-association">An <dfn title="dfn-activity-association">activity association</dfn><span class="withAsn">, written <span class="name">wasAssociatedWith(id,a,ag,pl,attrs)</span> in PROV-ASN,</span> has the following
 constituents:</p>
 <ul>
 <li><em>id</em>:  an OPTIONAL identifier for the association between an activity and an agent;</li> 
@@ -1122,7 +1123,7 @@
 <li><em>agent</em>: an identifier for the agent associated with the activity;</li>
 <li><em>plan</em>: an OPTIONAL identifier for the plan adopted by the agent in the context of this activity;
 <li><em>attributes</em>: an OPTIONAL set of attribute-value pairs that describe the modalities of association of this activity with this agent.</li>
-</ul>
+</ul></div>
 
 <div class="anexample">
 In the following example, a designer and an operator agents are associated with an activity. The designer's goals are achieved by a workflow <span class="name">ex:wf</span>.   
@@ -1232,7 +1233,7 @@
 might be a need to define specific aspects of control that various
 agents exert over a given activity.</p>
 
-<p>A <dfn title="dfn-responsibility-chain">responsibility chain</dfn><span class="withAsn">, written <span class="name">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span> in PROV-ASN,</span> has the following constituents:</p>
+<p><div class="attributes" id="attributes-responsibility-chain">A <dfn title="dfn-responsibility-chain">responsibility chain</dfn><span class="withAsn">, written <span class="name">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span> in PROV-ASN,</span> has the following constituents:</p>
 <ul>
 <li><em>id</em>:  an OPTIONAL identifier identifying the responsibility chain;</li> 
 <li><em>subordinate</em>: an identifier for the agent associated with an activity, acting on behalf of the responsible
@@ -1240,7 +1241,7 @@
 <li><em>responsible</em>: an identifier for the agent,  on behalf of which the subordinate agent acted;</li>
 <li><em>activity</em>: an OPTIONAL identifier of an activity for which the responsibility chain holds;</li>
 <li><em>attributes</em>: an OPTIONAL set of attribute-value pairs that describe the modalities of this relation.</li>
-</ul>
+</ul></div>
 
 
 <div class="anexample">
@@ -1330,7 +1331,7 @@
 
 <p>The three kinds of <dfn id="dfn-derivation">derivations</dfn> are successively introduced.  Making use of the attribute <span class="name">steps</span>, we can distinguish the various derivation types.</p>
 
-<p>A <dfn>precise-1 derivation</dfn><span class="withAsn">, written <span class="name">wasDerivedFrom(id, e2, e1, a, g2, u1, attrs)</span> in PROV-ASN,</span> contains:</p>
+<p><div class="attributes" id="attributes-derivation">A <dfn>precise-1 derivation</dfn><span class="withAsn">, written <span class="name">wasDerivedFrom(id, e2, e1, a, g2, u1, attrs)</span> in PROV-ASN,</span> contains:</p>
 <ul>
 <li><em>id</em>:  an OPTIONAL identifier  identifying the derivation;</li> 
 <li><em>generatedEntity</em>: the identifier  of the generation entity;</li>
@@ -1341,6 +1342,7 @@
 <li><em>attributes</em>: an OPTIONAL set of attribute-value pairs that describe the modalities of this derivation, optionally including the attribute-value
 pair <span class="name">prov:steps="single"</span>.</li>
 </ul>
+</div>
 <p>It is OPTIONAL to include  the attribute <span class="name">prov:steps</span> in a precise-1 derivation since it already refers to the one and only one activity underpinning the
 derivation.</p>