merge
authorStian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk>
Wed, 22 Feb 2012 09:07:24 +0000
changeset 1641 bf4e990c7722
parent 1640 49d47abe200f (current diff)
parent 1637 5b5b0cdba98b (diff)
child 1642 e878e740de73
merge
--- a/model/working-copy/glossary.html	Wed Feb 22 09:07:06 2012 +0000
+++ b/model/working-copy/glossary.html	Wed Feb 22 09:07:24 2012 +0000
@@ -60,6 +60,28 @@
 intended by the agent to achieve some goals in the context of this activity.
 </span>
 
+
+<span class="glossary" id="glossary-generation-event">  
+An <dfn id="dfn-generation-event">entity generation event</dfn> is the <a title="event">instantaneous event</a> that marks the  final instant of an entity's creation timespan, after which
+it is no longer available for use.
+</span>
+
+<span class="glossary" id="glossary-usage-event">  
+An <dfn id="dfn-usage-event">entity usage event</dfn> is the <a title="event">instantaneous event</a> that marks the first instant of an entity's consumption timespan by an activity.
+</span>
+
+<span class="glossary" id="glossary-destruction-event">  
+An <dfn id="dfn-destruction-event">entity destruction event</dfn> is the <a title="event">instantaneous event</a> that marks the  initial instant of an entity's destruction timespan, after which
+it no longer becomes available for use.
+</span>
+
+<span class="glossary" id="glossary-start-event">  
+An <dfn id="dfn-start-event">activity start event</dfn> is the <a title="event">instantaneous event</a> that marks the instant an activity starts.
+</span>
+
+<span class="glossary" id="glossary-end-event">  
+An <dfn id="dfn-end-event">activity end event</dfn> is the <a title="event">instantaneous event</a> that marks the instant an activity ends.
+</span>
 </html>
 
 
--- a/model/working-copy/glossary.js	Wed Feb 22 09:07:06 2012 +0000
+++ b/model/working-copy/glossary.js	Wed Feb 22 09:07:24 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/d711911bfb6a/model/working-copy/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file//model/working-copy/glossary.html';
 glossary_string= 
 ' ' + 
 '<html> ' + 
@@ -67,6 +67,28 @@
 'intended by the agent to achieve some goals in the context of this activity. ' + 
 '</span> ' + 
 ' ' + 
+' ' + 
+'<span class="glossary" id="glossary-generation-event">   ' + 
+'An <dfn id="dfn-generation-event">entity generation event</dfn> is the <a title="event">instantaneous event</a> that marks the  final instant of an entity\'s creation timespan, after which ' + 
+'it is no longer available for use. ' + 
+'</span> ' + 
+' ' + 
+'<span class="glossary" id="glossary-usage-event">   ' + 
+'An <dfn id="dfn-usage-event">entity usage event</dfn> is the <a title="event">instantaneous event</a> that marks the first instant of an entity\'s consumption timespan by an activity. ' + 
+'</span> ' + 
+' ' + 
+'<span class="glossary" id="glossary-destruction-event">   ' + 
+'An <dfn id="dfn-destruction-event">entity destruction event</dfn> is the <a title="event">instantaneous event</a> that marks the  initial instant of an entity\'s destruction timespan, after which ' + 
+'it no longer becomes available for use. ' + 
+'</span> ' + 
+' ' + 
+'<span class="glossary" id="glossary-start-event">   ' + 
+'An <dfn id="dfn-start-event">activity start event</dfn> is the <a title="event">instantaneous event</a> that marks the instant an activity starts. ' + 
+'</span> ' + 
+' ' + 
+'<span class="glossary" id="glossary-end-event">   ' + 
+'An <dfn id="dfn-end-event">activity end event</dfn> is the <a title="event">instantaneous event</a> that marks the instant an activity ends. ' + 
+'</span> ' + 
 '</html> ' + 
 ' ' + 
 ' ' +