--- a/model/working-copy/towards-wd4.html	Wed Feb 15 15:28:38 2012 +0000
+++ b/model/working-copy/towards-wd4.html	Wed Feb 15 15:47:52 2012 +0000
@@ -320,10 +320,13 @@
 <p>PROV-DM is a data model for describing the provenance of <em>Entities</em>, that is, of things in the world. The term "Things" encompasses a broad diversity of concepts, including digital objects such as a file or web page, 
 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><dfn title="concept-entity">Entities</dfn> are things in the world one
+<p>
+<div class="glossary" id="glossary-entity">
+<dfn title="concept-entity">Entities</dfn> are things in the world one
  wants to provide provenance for.  For the purpose of this
  specification, things can be physical, digital, conceptual, or
  otherwise; the world may be real or imaginary.
+</div>
 </p>
 
 
@@ -333,11 +336,15 @@
 
 
 
-<p>An <dfn id="concept-activity">activity</dfn> is anything that involves
+<p>
+<div class="glossary" id="glossary-activity">
+An <dfn id="concept-activity">activity</dfn> is anything that involves
 entities; this involvement can take multiple forms:  consuming them,  processing them, 
 transforming them,  modifying them,  changing them,  relocating
 them,  using them,  generating them, being associated with them,
-etc. Activities that operate on digital entities may for example move, copy, or duplicate them.</p>
+etc. Activities that operate on digital entities may for example move, copy, or duplicate them.
+</div>
+</p>
 
 
 
@@ -346,7 +353,11 @@
 </div>
 
 
-<p>An <dfn id="concept-agent">agent</dfn> is a type of entity that takes an active role in an activity such that it can be assigned some degree of responsibility for the activity taking.</p>
+<p>
+<div class="glossary" id="glossary-agent">
+An <dfn id="concept-agent">agent</dfn> is a type of entity that takes an active role in an activity such that it can be assigned some degree of responsibility for the activity taking.
+</div>
+</p>
 
 
 <p>The key purpose of agents is to assign responsibility
@@ -372,11 +383,19 @@
 
 <p>Activities and entities are associated with each other in two different ways: activities are consumers of entities and activities are producers of entities.  For provenance purpose, we define the following notions of generation and usage. </p>
 
-<p><dfn title="concept-generation">Generation</dfn> is the completed production of a new entity by activity.
- This entity become available for usage after this generation. This entity did not exist before generation. </p>
-
-<p><dfn title="concept-usage">Usage</dfn> is the beginning on  an entity being consumed by an activity.
-Before usage, the activity had not begun to consume or use to this entity (and could not have been affected by the entity).</p>
+<p>
+<div class="glossary" id="glossary-generation">
+<dfn title="concept-generation">Generation</dfn> is the completed production of a new entity by activity.
+ This entity become available for usage after this generation. This entity did not exist before generation. 
+</div>
+</p>
+
+<p>
+<div class="glossary" id="glossary-usage">
+<dfn title="concept-usage">Usage</dfn> is the beginning on  an entity being consumed by an activity.
+Before usage, the activity had not begun to consume or use to this entity (and could not have been affected by the entity).
+</div>
+</p>
 
 
 
@@ -395,7 +414,11 @@
 
 <p>Activities are consumers of entities and producers of entities. In some case, the consumption of entity influences the creation of another in some way. This notion is captured by derivations, defined as follows.</p>
 
-<p><dfn title="concept-derivation">Derivation</dfn> is something by which some entity is transformed from, created from, or affected by another entity in the world.  </p>
+<p>
+<div class="glossary" id="glossary-derivation">
+<dfn title="concept-derivation">Derivation</dfn> is something by which some entity is transformed from, created from, or affected by another entity in the world.  
+</div>
+</p>
 
 
 <div class="anexample" id="derivation-example">
@@ -410,8 +433,12 @@
 
 <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 this section. </p>
 
-<p>A <dfn title="concept-plan">Plan</dfn> is an entity that represent a set of
-actions or steps intended by one or more agents to achieve some goals. PROV-DM is not
+<p>
+<div class="glossary" id="glossary-plan">
+A <dfn title="concept-plan">Plan</dfn> is an entity that represent a set of
+actions or steps intended by one or more agents to achieve some goals. 
+</div>
+PROV-DM is not
 prescriptive about the nature of plans, their representation, the
 actions and steps they consist of, and their intended goals.  Since plans may evolve over time,
 it may become necessary to track their provenance, and hence, plans are