--- a/model/prov-dm.html	Wed Mar 28 11:53:40 2012 +0100
+++ b/model/prov-dm.html	Wed Mar 28 11:54:38 2012 +0100
@@ -24,8 +24,8 @@
       function updateGlossaryRefs() {
         $('.glossary-ref').each(function(index) {
           var ref=$(this).attr('data-ref');
-          var span=$(this).attr('withspan')
-          $(this).removeAttr('withspan');
+          var span=$(this).attr('data-withspan')
+          $(this).removeAttr('data-withspan');
           $(this).removeAttr('data-ref');
 
           $('#'+ref+'.glossary').contents().clone().appendTo($(this));
@@ -412,7 +412,7 @@
 physical things such as a building or a printed book, or a car as well as abstract concepts and ideas. One can regard any Web resource as an example of Entity in this context. </p>
 
 <p>
-<div class="glossary-ref" data-ref="glossary-entity"  withspan="true">
+<div class="glossary-ref" data-ref="glossary-entity"  data-withspan="true">
 </div>
 
 
@@ -424,7 +424,7 @@
 
 
 <p>
-<span class="glossary-ref" data-ref="glossary-activity"  withspan="true"></span> Activities that operate on digital entities may for example move, copy, or duplicate them.
+<span class="glossary-ref" data-ref="glossary-activity"  data-withspan="true"></span> Activities that operate on digital entities may for example move, copy, or duplicate them.
 </p>
 
 
@@ -442,12 +442,12 @@
  The term 'generation' refers to the completion of the the act of producing; likewise, the term 'usage' refers to the beginning of the act of consuming entities. Thus, we define the following notions of generation and usage. </p>
 
 <p>
-<div class="glossary-ref" data-ref="glossary-generation"  withspan="true">
+<div class="glossary-ref" data-ref="glossary-generation"  data-withspan="true">
 </div>
 
 
 <p>
-<div class="glossary-ref" data-ref="glossary-usage"  withspan="true">
+<div class="glossary-ref" data-ref="glossary-usage"  data-withspan="true">
 </div>
 
 
@@ -471,7 +471,7 @@
 <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>
 
 <p>
-<span class="glossary-ref" data-ref="glossary-derivation"  withspan="true"></span>
+<span class="glossary-ref" data-ref="glossary-derivation"  data-withspan="true"></span>
 
 
 
@@ -488,7 +488,7 @@
 <p>The motivation for introducing  agents in the model is to denote the agent's responsibility for activities. </p>
 
 <p>
-<span class="glossary-ref" data-ref="glossary-agent"  withspan="true">
+<span class="glossary-ref" data-ref="glossary-agent"  data-withspan="true">
 </span>
 </p>
 
@@ -512,7 +512,7 @@
 <p>There are some useful types of entities and agents that are commonly encountered in applications making data and documents available on the Web; we introduce them in the rest of this section. </p>
 
 <p>
-<span class="glossary-ref" data-ref="glossary-plan"  withspan="true">
+<span class="glossary-ref" data-ref="glossary-plan"  data-withspan="true">
 </span>
 There exist no
 prescriptive requirement on the nature of plans, their representation, the
@@ -538,7 +538,7 @@
 </div>
 
 <p>
-<span class="glossary-ref" data-ref="glossary-collection"  withspan="true"></span> This concept allows for the provenance of the collection, but also of its constituents to be expressed.  Such a notion of collection corresponds to a wide variety of  concrete data structures, such as a <em>maps</em>, <em>dictionaries</em>, or <em>associative arrays</em>.</p>
+<span class="glossary-ref" data-ref="glossary-collection"  data-withspan="true"></span> This concept allows for the provenance of the collection, but also of its constituents to be expressed.  Such a notion of collection corresponds to a wide variety of  concrete data structures, such as a <em>maps</em>, <em>dictionaries</em>, or <em>associative arrays</em>.</p>
 
 <div class="anexample" id="collection-example">
 <p>
@@ -548,7 +548,7 @@
 
 <!-- alternative names: provenance record, bundle -->
 <p>
-<span class="glossary-ref" data-ref="glossary-account"  withspan="true">
+<span class="glossary-ref" data-ref="glossary-account"  data-withspan="true">
 </span>Making an account an entity allows for provenance of provenance to be expressed.
 
 <div class="anexample" id="account-example">
@@ -571,7 +571,7 @@
 
 <p>Agents can be related to entities, activities, and other agents.</p>  
 
-<div class="glossary-ref" data-ref="glossary-attribution" withspan="true"></div>
+<div class="glossary-ref" data-ref="glossary-attribution" data-withspan="true"></div>
 
 <div class="anexample" id="association-example">
 <p>A blog post can be attributed to an author, a mobile phone to its manufacturer.</p>
@@ -598,7 +598,7 @@
 
 
 <p>
-<span class="glossary-ref" data-ref="glossary-activityAssociation"  withspan="true"></span>
+<span class="glossary-ref" data-ref="glossary-activityAssociation"  data-withspan="true"></span>
 </p>
 
 <div class="anexample" id="association-example2">
@@ -612,7 +612,7 @@
 </div>
 
 <p>
-<span class="glossary-ref" data-ref="glossary-responsibility"  withspan="true">
+<span class="glossary-ref" data-ref="glossary-responsibility"  data-withspan="true">
 </span> The nature of this relation is intended to be broad,  including delegation or contractual relation. </p>
 
 <!--<div class="note">Propose to rephrase as follows: <br/>