reorder components
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Tue, 19 Jun 2012 04:49:52 -0700
changeset 3414 d5cad12b84a2
parent 3413 c101044c1e57
child 3415 7853ad0f4085
reorder components
model/all-divs.js
model/prov-dm.html
--- a/model/all-divs.js	Tue Jun 19 11:40:39 2012 +0200
+++ b/model/all-divs.js	Tue Jun 19 04:49:52 2012 -0700
@@ -3,7 +3,7 @@
 //  with <script src="all-divs.js" class="remove"></script>
 //Insert glossary definitions with the following 
 // <div class="glossary-ref" ref="glossary-generation"></div>
-divs_hg='http://dvcs.w3.org/hg/prov/file/bb66a19760ba/model/prov-dm.html';
+divs_hg='http://dvcs.w3.org/hg/prov/file/c101044c1e57/model/prov-dm.html';
 divs_string= 
 '<html> \n' + 
 '<div style="text-align: left;"> \n' + 
@@ -41,7 +41,7 @@
 '            http://www.w3.org/2000/10/XMLSchema# \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            XML Schema Namespace [[!XMLSCHEMA-2]] \n' + 
+'            XML Schema Namespace [[!XMLSCHEMA11-2]] \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr> \n' + 
@@ -223,8 +223,6 @@
 '        news items according to some criteria, running a SPARQL query over a \n' + 
 '        triple store, or editing a file. \n' + 
 '      </p> \n' + 
-'    </div><div class="glossary-ref"> \n' + 
-'    </div><div class="glossary-ref"> \n' + 
 '    </div><div class="anexample conceptexample" id="generation-example"> \n' + 
 '      <p> \n' + 
 '        Examples of generation are the completed creation of a file by a \n' + 
@@ -242,7 +240,6 @@
 '        different activities (e.g. a file on a file system can be read \n' + 
 '        indefinitely). \n' + 
 '      </p> \n' + 
-'    </div><div class="glossary-ref"> \n' + 
 '    </div><div class="anexample conceptexample" id="communication-example"> \n' + 
 '      <p> \n' + 
 '        The activity of writing a celebrity article was informed by (a \n' + 
@@ -263,7 +260,7 @@
 '        site selling books on the Web, the services involved in the processing \n' + 
 '        of orders, and the companies hosting them are also agents. \n' + 
 '      </p> \n' + 
-'    </div><div class="glossary-ref" /><div class="anexample conceptexample" id="attribution-example"> \n' + 
+'    </div><div class="anexample conceptexample" id="attribution-example"> \n' + 
 '      <p> \n' + 
 '        A blog post can be attributed to an author, a mobile phone to its \n' + 
 '        manufacturer. \n' + 
@@ -307,7 +304,7 @@
 '    </div><div class="anexample conceptexample" id="bundle-example"> \n' + 
 '      <p> \n' + 
 '        For users to decide whether they can place their trust in a resource, \n' + 
-'        they may want to analyze the resource\'s provenance, but also determine \n' + 
+'        they may want to analyze the resource's provenance, but also determine \n' + 
 '        who its provenance is attributed to, and when it was generated. In other \n' + 
 '        words, users need to be able to determine the provenance of provenance. \n' + 
 '        Hence, provenance is also regarded as an entity (of type Bundle), by \n' + 
@@ -486,8 +483,8 @@
 'wasGeneratedBy(e2,a1) \n' + 
 '</pre> \n' + 
 '      The same descriptions, but with an explicit identifier <span class="name">u1</span> \n' + 
-'      for the usage, and the syntactic marker \'<span class="name">-</span>\' to \n' + 
-'      mark the absence of identifier in the generation. Both are followed by \'<span class="name">;</span>\'. \n' + 
+'      for the usage, and the syntactic marker '<span class="name">-</span>' to \n' + 
+'      mark the absence of identifier in the generation. Both are followed by '<span class="name">;</span>'. \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 'used(u1;a1,e1) \n' + 
 'wasGeneratedBy(-;e2,a1) \n' + 
@@ -505,22 +502,22 @@
 '          comprising time-related concepts. \n' + 
 '        </li> \n' + 
 '        <li> \n' + 
-'          <b>Component 2: agents and responsibility.</b> The second component \n' + 
+'          <b>Component 2: derivations.</b> The second component is formed with \n' + 
+'          derivations and derivation subtypes. \n' + 
+'        </li> \n' + 
+'        <li> \n' + 
+'          <b>Component 3: agents and responsibility.</b> The third component \n' + 
 '          consists of agents and concepts ascribing responsibility to agents. \n' + 
 '        </li> \n' + 
 '        <li> \n' + 
-'          <b>Component 3: derivations.</b> The third component is formed with \n' + 
-'          derivations and derivation subtypes. \n' + 
+'          <b>Component 4: bundles.</b> The fourth component is concerned with \n' + 
+'          bundles, a mechanism to support provenance of provenance. \n' + 
 '        </li> \n' + 
 '        <li> \n' + 
-'          <b>Component 4: alternate.</b> The fourth component consists of \n' + 
+'          <b>Component 5: alternate.</b> The fifth component consists of \n' + 
 '          relations linking entities referring to the same thing. \n' + 
 '        </li> \n' + 
 '        <li> \n' + 
-'          <b>Component 5: bundles.</b> The fifth component is concerned with \n' + 
-'          bundles, a mechanism to support provenance of provenance. \n' + 
-'        </li> \n' + 
-'        <li> \n' + 
 '          <b>Component 6: collections.</b> The sixth component is about \n' + 
 '          collections and concepts capturing their transformation, such as \n' + 
 '          insertion and removal. \n' + 
@@ -664,7 +661,7 @@
 '            <a>Generation</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="wasGeneratedBy"><span class="essential">wasGeneratedBy(</span>id;<span class="essential">e,a</span>,t,attrs<span class="essential">)</span></a> \n' + 
+'            <a title="WasGeneratedBy"><span class="essential">wasGeneratedBy(</span>id;<span class="essential">e,a</span>,t,attrs<span class="essential">)</span></a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component1-color"> \n' + 
@@ -729,7 +726,7 @@
 '            <a>Revision</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="revision">... prov:type=\'prov:WasRevisionOf\' ...</a> \n' + 
+'            <a title="WasRevisionOf">... prov:type='prov:WasRevisionOf' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component2-color"> \n' + 
@@ -737,7 +734,7 @@
 '            <a>Quotation</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="quotation">... prov:type=\'prov:WasQuotedFrom\' ...</a> \n' + 
+'            <a title="WasQuotedFrom">... prov:type='prov:WasQuotedFrom' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component2-color"> \n' + 
@@ -745,7 +742,8 @@
 '            <a>Primary Source</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="Primary Source">... prov:type=\'prov:HadPrimarySource\' ...</a> \n' + 
+'            <a title="HadPrimarySource">... prov:type='prov:HadPrimarySource' \n' + 
+'            ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component2-color"> \n' + 
@@ -801,7 +799,7 @@
 '            <a>Plan</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="plan">... prov:type=\'prov:Plan\' ...</a> \n' + 
+'            <a title="plan">... prov:type='prov:Plan' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component3-color"> \n' + 
@@ -809,7 +807,7 @@
 '            <a>Person</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="person">... prov:type=\'prov:Person\' ...</a> \n' + 
+'            <a title="person">... prov:type='prov:Person' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component3-color"> \n' + 
@@ -817,7 +815,7 @@
 '            <a>Organization</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="organization">... prov:type=\'prov:Organization\' ...</a> \n' + 
+'            <a title="organization">... prov:type='prov:Organization' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component3-color"> \n' + 
@@ -825,7 +823,7 @@
 '            <a title="software-agent">SoftwareAgent</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="software-agent">... prov:type=\'prov:SoftwareAgent\' ...</a> \n' + 
+'            <a title="software-agent">... prov:type='prov:SoftwareAgent' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr> \n' + 
@@ -850,7 +848,7 @@
 '            <a title="bundle">Bundle type</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="bundle">... prov:type=\'prov:Bundle\' ...</a> \n' + 
+'            <a title="bundle">... prov:type='prov:Bundle' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr> \n' + 
@@ -895,7 +893,7 @@
 '            <a>Collection</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="collection">... prov:type=\'prov:Collection\' ...</a> \n' + 
+'            <a title="collection">... prov:type='prov:Collection' ...</a> \n' + 
 '          </td> \n' + 
 '          <td rowspan="7"> \n' + 
 '            <a href="#component6">Component 6: Collections</a> \n' + 
@@ -914,7 +912,7 @@
 '            <a>Dictionary</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="dictionary">... prov:type=\'prov:Dictionary\' ...</a> \n' + 
+'            <a title="dictionary">... prov:type='prov:Dictionary' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component6-color"> \n' + 
@@ -922,7 +920,7 @@
 '            <a title="empty dictionary">EmptyDictionary</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="empty dictionary">... prov:type=\'prov:EmptyDictionary\' ...</a> \n' + 
+'            <a title="empty dictionary">... prov:type='prov:EmptyDictionary' ...</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '        <tr class="component6-color"> \n' + 
@@ -948,7 +946,7 @@
 '            <a>Dictionary Membership</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            <a title="memberOf">memberOf(d, {(key_1, e_1), ..., (key_n, e_n)})</a> \n' + 
+'            <a title="memberOf-d">memberOf(d, {(key_1, e_1), ..., (key_n, e_n)})</a> \n' + 
 '          </td> \n' + 
 '        </tr> \n' + 
 '      </table> \n' + 
@@ -1027,7 +1025,7 @@
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 'activity(a1,2011-11-16T16:05:00,2011-11-16T16:06:00, \n' + 
-'        [ ex:host="server.example.org", prov:type=\'ex:edit\' ]) \n' + 
+'        [ ex:host="server.example.org", prov:type='ex:edit' ]) \n' + 
 '</pre> \n' + 
 '      <p> \n' + 
 '        states the existence of an activity with identifier <span class="name">a1</span>, \n' + 
@@ -1263,7 +1261,7 @@
 'activity(ex:filling-fuel) \n' + 
 'activity(ex:observing-low-fuel) \n' + 
 ' \n' + 
-'agent(ex:driver, [ prov:type=\'prov:Person\'  ) \n' + 
+'agent(ex:driver, [ prov:type='prov:Person'  ) \n' + 
 'wasAssociatedWith(ex:filling-fuel, ex:driver) \n' + 
 'wasAssociatedWith(ex:observing-low-fuel, ex:driver) \n' + 
 ' \n' + 
@@ -1366,7 +1364,7 @@
 '</pre> \n' + 
 '      We refer to example <a href="#anexample-specialization" class="anexample-ref"><span>Example REF</span></a> for further \n' + 
 '      descriptions of the BBC Web site, and to <a href="#term-dictionary-membership">Section 5.6.5</a> for a description of \n' + 
-'      the relation <a>memberOf</a>. \n' + 
+'      the relation <a title="memberOf-d">memberOf</a>. \n' + 
 '    </div><div class="anexample" id="anexample-invalidation3"> \n' + 
 '      <p> \n' + 
 '        In this example, the "buy one beer, get one free" offer expired at the \n' + 
@@ -1484,14 +1482,14 @@
 '        was a revision of the report <span class="name">tr:WD-prov-dm-20111018</span>. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(tr:WD-prov-dm-20111215, [ prov:type=\'rec54:WD\'  ]) \n' + 
-'entity(tr:WD-prov-dm-20111018, [ prov:type=\'rec54:WD\'  ]) \n' + 
-'wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [ prov:type=\'prov:WasRevisionOf\' ]) \n' + 
+'entity(tr:WD-prov-dm-20111215, [ prov:type='rec54:WD'  ]) \n' + 
+'entity(tr:WD-prov-dm-20111018, [ prov:type='rec54:WD'  ]) \n' + 
+'wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [ prov:type='prov:WasRevisionOf' ]) \n' + 
 '</pre> \n' + 
 '    </div><div class="anexample" id="anexample-quotation"> \n' + 
 '      <p> \n' + 
 '        The following paragraph is a quote from one of <a href="http://thinklinks.wordpress.com/2012/03/07/thoughts-from-the-dagstuhl-principles-of-provenance-workshop/">the \n' + 
-'        author\'s blogs</a>. \n' + 
+'        author's blogs</a>. \n' + 
 '      </p> \n' + 
 '      <blockquote id="bl-dagstuhl" /> \n' + 
 '      <em> "During the workshop, it became clear to me that the consensus based \n' + 
@@ -1516,23 +1514,24 @@
 'agent(ex:Paul) \n' + 
 'wasDerivedFrom(dm:bl-dagstuhl, \n' + 
 '               wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/, \n' + 
-'               [ prov:type=\'prov:WasQuotedFrom\' ]) \n' + 
+'               [ prov:type='prov:WasQuotedFrom' ]) \n' + 
 'wasAttributedTo(dm:bl-dagstuhl, ex:Luc) \n' + 
 'wasAttributedTo(wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/, ex:Paul) \n' + 
 '</pre> \n' + 
-'    </div><div class="anexample"> \n' + 
+'    </div><div class="anexample" id="anexample-primary-source1"> \n' + 
 '      <p> \n' + 
-'        Let us consider the concept introduced in the current section, \n' + 
-'        identified as <a title="primary source"><span class="name">dm:concept-primary-source</span></a>, \n' + 
-'        and the Google page <a href="http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html"><span class="name">go:credit-where-credit-is-due.html</span></a>, where the \n' + 
-'        notion original-source was originally described (to the knowledge of the \n' + 
-'        authors). \n' + 
+'        Let us consider Charles Joseph Minard's flow map of Napoleon's March in \n' + 
+'        1812, which was published in 1869. Although the map is not a primary \n' + 
+'        source, Minard probably used the journal of Pierre-Irénée Jacob, \n' + 
+'        pharmacist to Napoleon's army during the Russian campaign. This primary \n' + 
+'        source relation can be encoded as follows. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(dm:concept-primary-source) \n' + 
-'entity(go:credit-where-credit-is-due.html) \n' + 
-'wasDerivedFrom(dm:concept-primary-source, go:credit-where-credit-is-due.html,  \n' + 
-'               [ prov:type=\'prov:HadPrimarySource\' ]) \n' + 
+'entity(ex:la-campagne-de-Russie-1812-1813) \n' + 
+'entity(ex:revue-d-Histoire-de-la-Pharmacie-t-XVIII) \n' + 
+'wasDerivedFrom(ex:la-campagne-de-Russie-1812-1813, \n' + 
+'               ex:revue-d-Histoire-de-la-Pharmacie-t-XVIII, \n' + 
+'               [ prov:type='prov:HadPrimarySource' ]) \n' + 
 '</pre> \n' + 
 '    </div><div style="text-align: center;"> \n' + 
 '      <!--  <img src="images/Agents-Responsibility.png" alt="agents and \n' + 
@@ -1560,7 +1559,7 @@
 '        number 1234. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'agent(e1, [ex:employee="1234", ex:name="Alice", prov:type=\'prov:Person\' ]) \n' + 
+'agent(e1, [ex:employee="1234", ex:name="Alice", prov:type='prov:Person' ]) \n' + 
 '</pre> \n' + 
 '      <p> \n' + 
 '        It is optional to specify the type of an agent. When present, it is \n' + 
@@ -1600,7 +1599,7 @@
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 'agent(ex:Paolo, [ prov:type="Person" ]) \n' + 
 'agent(ex:Simon, [ prov:type="Person" ]) \n' + 
-'entity(tr:WD-prov-dm-20111215, [ prov:type=\'rec54:WD\' ]) \n' + 
+'entity(tr:WD-prov-dm-20111215, [ prov:type='rec54:WD' ]) \n' + 
 'wasAttributedTo(tr:WD-prov-dm-20111215, ex:Paolo, [ prov:type="editorship" ]) \n' + 
 'wasAttributedTo(tr:WD-prov-dm-20111215, ex:Simon, [ prov:type="authorship" ]) \n' + 
 '</pre> \n' + 
@@ -1636,7 +1635,7 @@
 '    </div><div class="anexample" id="anexample-wasAssociatedWith"> \n' + 
 '      <p> \n' + 
 '        In the following example, a designer agent and an operator agent are \n' + 
-'        associated with an activity. The designer\'s goals are achieved by a \n' + 
+'        associated with an activity. The designer's goals are achieved by a \n' + 
 '        workflow <span class="name">ex:wf</span>, described as an an entity of \n' + 
 '        type <span class="name"><a>plan</a></span>. \n' + 
 '      </p> \n' + 
@@ -1646,7 +1645,7 @@
 'agent(ex:ag2,  [ prov:type="designer" ]) \n' + 
 'wasAssociatedWith(ex:a, ex:ag1, -,     [ prov:role="loggedInUser", ex:how="webapp" ]) \n' + 
 'wasAssociatedWith(ex:a, ex:ag2, ex:wf, [ prov:role="designer", ex:context="project1" ]) \n' + 
-'entity(ex:wf, [ prov:type=\'prov:Plan\' ,  \n' + 
+'entity(ex:wf, [ prov:type='prov:Plan' ,  \n' + 
 '                ex:label="Workflow 1",  \n' + 
 '                ex:url="http://example.org/workflow1.bpel" %% xsd:anyURI ]) \n' + 
 '</pre> \n' + 
@@ -1661,7 +1660,7 @@
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 'activity(ex:a, [ prov:type="workflow execution" ]) \n' + 
 'wasAssociatedWith(ex:a, -, ex:wf) \n' + 
-'entity(ex:wf, [ prov:type=\'prov:Plan\',  \n' + 
+'entity(ex:wf, [ prov:type='prov:Plan',  \n' + 
 '                ex:label="Workflow 1",  \n' + 
 '                ex:url="http://example.org/workflow1.bpel" %% xsd:anyURI]) \n' + 
 '</pre> \n' + 
@@ -1704,8 +1703,8 @@
 '        with a workflow activity. The programmer acts on behalf of the \n' + 
 '        researcher (line-management) encoding the commands specified by the \n' + 
 '        researcher; the researcher acts on behalf of the funder, who has a \n' + 
-'        contractual agreement with the researcher. The terms \'line-management\' \n' + 
-'        and \'contract\' used in this example are domain specific. \n' + 
+'        contractual agreement with the researcher. The terms 'line-management' \n' + 
+'        and 'contract' used in this example are domain specific. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 'activity(a,[ prov:type="workflow" ]) \n' + 
@@ -1748,7 +1747,7 @@
 '        </li> \n' + 
 '      </ul> \n' + 
 '      <p> \n' + 
-'        A bundle\'s identifier <span class="name">id</span> identifies a unique \n' + 
+'        A bundle's identifier <span class="name">id</span> identifies a unique \n' + 
 '        set of descriptions. \n' + 
 '      </p> \n' + 
 '    </div><div class="anexample" id="anexample-provenance-of-provenance"> \n' + 
@@ -1792,7 +1791,7 @@
 '        provenance can be described as follows. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
-'entity(bob:bundle1, [prov:type=\'prov:Bundle\']) \n' + 
+'entity(bob:bundle1, [prov:type='prov:Bundle']) \n' + 
 'wasGeneratedBy(bob:bundle1, -, 2012-05-24T10:30:00) \n' + 
 'wasAttributedTo(bob:bundle1, ex:Bob) \n' + 
 '</pre> \n' + 
@@ -1801,7 +1800,7 @@
 '        derivation of <span class="name">ex:report2</span> from <span class="name">ex:report1</span>. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
-'entity(alice:bundle2, [ prov:type=\'prov:Bundle\' ]) \n' + 
+'entity(alice:bundle2, [ prov:type='prov:Bundle' ]) \n' + 
 'wasGeneratedBy(alice:bundle2, -, 2012-05-25T11:15:00) \n' + 
 'wasAttributedTo(alice:bundle2, ex:Alice) \n' + 
 '</pre> \n' + 
@@ -1820,8 +1819,8 @@
 '  wasDerivedFrom(ex:report2, ex:report1) \n' + 
 'endBundle \n' + 
 ' \n' + 
-'entity(agg:bundle3, [ prov:type=\'prov:Bundle\' ]) \n' + 
-'agent(ex:aggregator01, [ prov:type=\'ex:Aggregator\' ]) \n' + 
+'entity(agg:bundle3, [ prov:type='prov:Bundle' ]) \n' + 
+'agent(ex:aggregator01, [ prov:type='ex:Aggregator' ]) \n' + 
 'wasAttributedTo(agg:bundle3, ex:aggregator01) \n' + 
 'wasDerivedFrom(agg:bundle3, bob:bundle1) \n' + 
 'wasDerivedFrom(agg:bundle3, alice:bundle2) \n' + 
@@ -1868,7 +1867,7 @@
 '</pre> \n' + 
 '      We have created a new qualified name, <span class="name">ex:bbcNews2012-03-23</span>, \n' + 
 '      in the namespace <span class="name">ex</span>, to identify the specific \n' + 
-'      page carrying this day\'s news, which would otherwise be the generic <span class="name">bbc:news/</span> page. \n' + 
+'      page carrying this day's news, which would otherwise be the generic <span class="name">bbc:news/</span> page. \n' + 
 '    </div><div class="attributes" id="attributes-alternate"> \n' + 
 '      An <dfn title="alternateOf">alternate</dfn> relation<span class="withPn">, \n' + 
 '      written <span class="pnExpression">alternateOf(e1, e2)</span> in PROV-N,</span> \n' + 
@@ -1916,18 +1915,17 @@
 '      <ul> \n' + 
 '        <li> \n' + 
 '          <span class="attribute" id="contextualization.local">local</span>: an \n' + 
-'          identifier (<span class="name">l</span>) for something in the current \n' + 
-'          bundle presenting the aspects of <span class="name">e</span> in bundle \n' + 
-'          <span class="name">b</span> ; \n' + 
+'          identifier (<span class="name">l</span>) for an entity in the local \n' + 
+'          bundle (not explicitly identified) presenting the aspects of <span class="name">e</span> in remote bundle <span class="name">b</span> ; \n' + 
 '        </li> \n' + 
 '        <li> \n' + 
 '          <span class="attribute" id="contextualization.contextualized">contextualized</span>: \n' + 
-'          an identifier (<span class="name">e</span>) of something identifiable \n' + 
-'          in some bundle <span class="name">b</span>; \n' + 
+'          an identifier (<span class="name">e</span>) of an entity in some \n' + 
+'          remote bundle <span class="name">b</span>; \n' + 
 '        </li> \n' + 
 '        <li> \n' + 
 '          <span class="attribute" id="contextualization.context">bundle</span>: \n' + 
-'          an identifier (<span class="name">b</span>) for a bundle. \n' + 
+'          an identifier (<span class="name">b</span>) for a remote bundle. \n' + 
 '        </li> \n' + 
 '      </ul> \n' + 
 '    </div><div class="anexample" id="anexample-contextualization1"> \n' + 
@@ -1952,13 +1950,13 @@
 '        creates a new bundle <span class="name">tool:analysis01</span> \n' + 
 '        containing the following. A new agent <span class="name">tool:Bob-2011-11-16</span> \n' + 
 '        is declared as a contextualization of <span class="name">ex:Bob</span> \n' + 
-'        as described in context <span class="name">ex:run1</span>, and likewise \n' + 
-'        for <span class="name">tool:Bob-2011-11-17</span> with respect to <span class="name">ex:run2</span>. The tool adds a performance attribute to \n' + 
-'        each of these specialized entities as follows: the performance of the \n' + 
-'        agent in the first bundle is judged to be good since the duration of \n' + 
-'        <span class="name">ex:a1</span> is one hour, whereas it is judged to be \n' + 
-'        bad in the second bundle since <span class="name">ex:a2</span>\'s \n' + 
-'        duration is seven hours. \n' + 
+'        as described in remote bundle <span class="name">ex:run1</span>, and \n' + 
+'        likewise for <span class="name">tool:Bob-2011-11-17</span> with respect \n' + 
+'        to <span class="name">ex:run2</span>. The tool adds a domain-specific \n' + 
+'        performance attribute to each of these specialized entities as follows: \n' + 
+'        the performance of the agent in the first bundle is judged to be good \n' + 
+'        since the duration of <span class="name">ex:a1</span> is one hour, \n' + 
+'        whereas it is judged to be bad in the second bundle since <span class="name">ex:a2</span>'s duration is seven hours. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 'bundle tool:analysis01 \n' + 
@@ -1982,7 +1980,7 @@
 '  wasGeneratedBy(ex:g2; ex:report2,-,2012-05-25T11:00:01) \n' + 
 '  wasDerivedFrom(ex:report2, ex:report1) \n' + 
 'endBundle \n' + 
-'entity(obs:bundle1, [ prov:type=\'prov:Bundle\' ]) \n' + 
+'entity(obs:bundle1, [ prov:type='prov:Bundle' ]) \n' + 
 'wasAttributedTo(obs:bundle1, ex:observer01) \n' + 
 '</pre> \n' + 
 '      Bundle <span class="name">obs:bundle1</span> is rendered by a \n' + 
@@ -1993,7 +1991,7 @@
 '      as follows. \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
 'bundle tool:bundle2 \n' + 
-'  entity(tool:bundle2, [ prov:type=\'viz:Configuration\', prov:type=\'prov:Bundle\' ]) \n' + 
+'  entity(tool:bundle2, [ prov:type='viz:Configuration', prov:type='prov:Bundle' ]) \n' + 
 '  wasAttributedTo(tool:bundle2, viz:Visualizer) \n' + 
 ' \n' + 
 '  entity(tool:report1, [viz:color="orange"]) \n' + 
@@ -2026,8 +2024,8 @@
 '      Component Overview \n' + 
 '    </div><div class="anexample"> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(c0, [prov:type=\'prov:EmptyCollection\' ])  // c0 is an empty collection \n' + 
-'entity(c1, [prov:type=\'prov:Collection\'  ])      // c1 is a collection, with unknown content \n' + 
+'entity(c0, [prov:type='prov:EmptyCollection' ])  // c0 is an empty collection \n' + 
+'entity(c1, [prov:type='prov:Collection'  ])      // c1 is a collection, with unknown content \n' + 
 '</pre> \n' + 
 '    </div><div class="attributes" id="attributes-memberOf"> \n' + 
 '      A <dfn title="memberOf">membership</dfn> relation, written <span class="pnExpression">memberOf(id; c, {e_1, ..., e_n}, cplt, attrs)</span>, \n' + 
@@ -2073,10 +2071,10 @@
 '      </ul> \n' + 
 '    </div><div class="anexample"> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d0, [prov:type=\'prov:EmptyDictionary\' ])  // d0 is an empty dictionary \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\'  ])      // d1 is a dictionary, with unknown content \n' + 
+'entity(d0, [prov:type='prov:EmptyDictionary' ])  // d0 is an empty dictionary \n' + 
+'entity(d1, [prov:type='prov:Dictionary'  ])      // d1 is a dictionary, with unknown content \n' + 
 '</pre> \n' + 
-'    </div><div class="attributes" id="attributes-memberOf_"> \n' + 
+'    </div><div class="attributes" id="attributes-memberOf-d"> \n' + 
 '      A <dfn title="memberOf-d">membership</dfn> relation, written <span class="pnExpression">memberOf(id; c, {(key_1, e_1), ..., (key_n, e_n)}, \n' + 
 '      cplt, attrs)</span>, has: \n' + 
 '      <ul> \n' + 
@@ -2084,10 +2082,8 @@
 '          <span class="attribute" id="membership-d.id">id</span>: an OPTIONAL \n' + 
 '          identifier identifying the relation; \n' + 
 '        </li> \n' + 
-    '        <li> \n';
-
-divs_string=divs_string +
-'          <span class="attribute" id="membership-d.collection">collection</span>: \n' + 
+'        <li> \n' + 
+'          <span class="attribute" id="membership-d.dictionary">dictionary</span>: \n' + 
 '          an identifier (<span class="name">c</span>) for the dictionary whose \n' + 
 '          members are asserted; \n' + 
 '        </li> \n' + 
@@ -2128,8 +2124,8 @@
 '      </ul> \n' + 
 '    </div><div class="anexample"> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\' ])    // d1 is a dictionary, with unknown content \n' + 
-'entity(d2, [prov:type=\'prov:Dictionary\' ])    // d2 is a dictionary, with unknown content \n' + 
+'entity(d1, [prov:type='prov:Dictionary' ])    // d1 is a dictionary, with unknown content \n' + 
+'entity(d2, [prov:type='prov:Dictionary' ])    // d2 is a dictionary, with unknown content \n' + 
 ' \n' + 
 'entity(e1) \n' + 
 'entity(e2) \n' + 
@@ -2189,12 +2185,12 @@
 '      </ul> \n' + 
 '    </div><div class="anexample"> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d0, [prov:type=\'prov:EmptyDictionary\' ])    // d0 is an empty dictionary \n' + 
+'entity(d0, [prov:type='prov:EmptyDictionary' ])    // d0 is an empty dictionary \n' + 
 'entity(e1) \n' + 
 'entity(e2) \n' + 
 'entity(e3) \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\' ]) \n' + 
-'entity(d2, [prov:type=\'prov:Dictionary\' ]) \n' + 
+'entity(d1, [prov:type='prov:Dictionary' ]) \n' + 
+'entity(d2, [prov:type='prov:Dictionary' ]) \n' + 
 ' \n' + 
 'derivedByInsertionFrom(d1, d0, {("k1", e1), ("k2", e2)})        \n' + 
 'derivedByInsertionFrom(d2, d1, {("k3", e3)})     \n' + 
@@ -2215,12 +2211,12 @@
 '      </ul> \n' + 
 '    </div><div class="anexample"> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d0, [prov:type=\'prov:EmptyDictionary\' ])    // d0 is an empty dictionary \n' + 
+'entity(d0, [prov:type='prov:EmptyDictionary' ])    // d0 is an empty dictionary \n' + 
 'entity(e1) \n' + 
 'entity(e2) \n' + 
 'entity(e3) \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\' ]) \n' + 
-'entity(d2, [prov:type=\'prov:Dictionary\' ]) \n' + 
+'entity(d1, [prov:type='prov:Dictionary' ]) \n' + 
+'entity(d2, [prov:type='prov:Dictionary' ]) \n' + 
 ' \n' + 
 'derivedByInsertionFrom(d1, d0, {("k1", e1), ("k2", e2)})        \n' + 
 'derivedByInsertionFrom(d2, d1, {("k1", e3)})     \n' + 
@@ -2336,7 +2332,7 @@
 '            <em>any construct</em> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
-'            A <a>Value</a> of type <a class="section-ref" href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a> \n' + 
+'            A <a>Value</a> of type <a class="section-ref" href="http://www.w3.org/TR/xmlschema11-2/#string">xsd:string</a> \n' + 
 '          </td> \n' + 
 '          <td> \n' + 
 '            <a class="section-ref" href="#term-attribute-label"><span>TBD</span></a> \n' + 
@@ -2442,7 +2438,7 @@
 '        The following describes an agent of type software agent. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'   agent(ag, [ prov:type=\'prov:SoftwareAgent\' ]) \n' + 
+'   agent(ag, [ prov:type='prov:SoftwareAgent' ]) \n' + 
 '</pre> \n' + 
 '    </div><div class="anexample"> \n' + 
 '      <p> \n' + 
@@ -2469,29 +2465,31 @@
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
 '  "abc" \n' + 
-'  1 \n' + 
+'  "1" %% xsd:integer \n' + 
 '  "http://example.org/foo" %% xsd:anyURI \n' + 
 '</pre> \n' + 
 '      <p> \n' + 
-'        The following example shows a value of type <span class="name">xsd:QName</span> \n' + 
-'        (see <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#QName">QName</a> \n' + 
-'        [[!XMLSCHEMA-2]]). The prefix <span class="name">ex</span> MUST be bound \n' + 
-'        to a <a>namespace</a> declared in a <a>namespace declaration</a>. \n' + 
+'        The following example shows a value of type <span class="name">prov:QUALIFIED_NAME</span> \n' + 
+'        (see <span class="name"><a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></span> \n' + 
+'        [[PROV-N]]). The prefix <span class="name">ex</span> MUST be bound to a \n' + 
+'        <a>namespace</a> declared in a <a>namespace declaration</a>. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
-'  "ex:value" %% xsd:QName \n' + 
+'  "ex:value" %% prov:QUALIFIED_NAME \n' + 
+'</pre> \n' + 
+'      Alternatively, the same value can be expressed using the following \n' + 
+'      convenience notation. \n' + 
+'<pre class="codeexample" xml:space="preserve">  \n' + 
+'  'ex:value' \n' + 
 '</pre> \n' + 
 '    </div><div class="anexample" id="anexample-time"> \n' + 
 '      <p> \n' + 
-'        In the following example, the generation time of entity <span class="name">e1</span> is expressed according to <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a> \n' + 
-'        [[!XMLSCHEMA-2]]. \n' + 
+'        In the following example, the generation time of entity <span class="name">e1</span> is expressed according to <a href="http://www.w3.org/TR/xmlschema11-2/#dateTime">xsd:dateTime</a> \n' + 
+'        [[!XMLSCHEMA11-2]]. \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
 '  wasGeneratedBy(e1,a1, 2001-10-26T21:32:52) \n' + 
 '</pre> \n' + 
-'    </div><div class="note"> \n' + 
-'      We need to check that we are including all xsd types that are the latest \n' + 
-'      versions of XML Schema/RDF. \n' + 
 '    </div><div class="anexample" id="anexample-sub-relation"> \n' + 
 '          <p> \n' + 
 '            In the following example, <span class="name">e2</span> is a \n' + 
@@ -2499,7 +2497,7 @@
 '            of derivation. \n' + 
 '          </p> \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
-'  wasDerivedFrom(e2,e1, [prov:type=\'ex:Translation\' ]) \n' + 
+'  wasDerivedFrom(e2,e1, [prov:type='ex:Translation' ]) \n' + 
 '</pre> \n' + 
 '        </div><div class="anexample" id="anexample-sub-type"> \n' + 
 '          <p> \n' + 
@@ -2507,7 +2505,20 @@
 '            as a Car, a type of entity. \n' + 
 '          </p> \n' + 
 '<pre class="codeexample" xml:space="preserve">  \n' + 
-'  entity(e, [prov:type=\'ex:Car\' ]) \n' + 
+'  entity(e, [prov:type='ex:Car' ]) \n' + 
+'</pre> \n' + 
+'        </div><div class="anexample" id="anexample-usage-with-role"> \n' + 
+'          <p> \n' + 
+'            In the following example, two computers <span class="name">ex:laptop4</span> \n' + 
+'            and <span class="name">ex:desktop9</span> are used in different \n' + 
+'            roles in a work activity. \n' + 
+'          </p> \n' + 
+'<pre class="codeexample" xml:space="preserve">  \n' + 
+'  activity(ex:work) \n' + 
+'  entity(ex:laptop4) \n' + 
+'  entity(ex:desktop9) \n' + 
+'  used(ex:work, ex:laptop4,  [prov:role="day-to-day machine"]) \n' + 
+'  used(ex:work, ex:desktop9, [prov:role="backup machine"]) \n' + 
 '</pre> \n' + 
 '        </div><div id="glossary_div" class="remove"> \n' + 
 '      <!--  glossary loaded from glossary.js will be hooked up here, class \n' + 
@@ -2696,7 +2707,7 @@
 '      consistent with the above constraints. This will be revised once the \n' + 
 '      consensus on ISSUE-29 is clearer. \n' + 
 '    </div><div class="anexample" id="anexample-not-symmetric"> \n' + 
-'      "Alice\'s toyota car on fifth Avenue" is a specialization of "Alice\'s \n' + 
+'      "Alice's toyota car on fifth Avenue" is a specialization of "Alice's \n' + 
 '      toyota car", but the converse does not hold. \n' + 
 '    </div><div class="anexample" id="anexample-specialization-not-anti-symmetric"> \n' + 
 '      anti-symmetric counter-example??? \n' + 
@@ -2770,7 +2781,7 @@
 '        <span class="name">t1</span>=<span class="name">t2</span> and <span class="name">attrs1</span>=<span class="name">attrs2</span>. \n' + 
 '      </p> \n' + 
 '    </div><div class="note"> \n' + 
-'      Wouldn\'t the above constraint violate uniqueness? \n' + 
+'      Wouldn't the above constraint violate uniqueness? \n' + 
 '    </div><div class="note"> \n' + 
 '      Invalidation uniqueness? \n' + 
 '    </div><div class="note"> \n' + 
@@ -2951,9 +2962,9 @@
 '    </div><div class="anexample"> \n' + 
 '      Consider the following statements about three dictionaries. \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\']) \n' + 
-'entity(d2, [prov:type=\'prov:Dictionary\']) \n' + 
-'entity(d3, [prov:type=\'prov:Dictionary\']) \n' + 
+'entity(d1, [prov:type='prov:Dictionary']) \n' + 
+'entity(d2, [prov:type='prov:Dictionary']) \n' + 
+'entity(d3, [prov:type='prov:Dictionary']) \n' + 
 ' \n' + 
 ' \n' + 
 'derivedByInsertionFrom(d3, d1, {("k1", e1), ("k2", e2)}) \n' + 
@@ -2997,10 +3008,10 @@
 '</pre> \n' + 
 '    </div><div class="anexample"> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d0, [prov:type=\'prov:EmptyDictionary\'])    // d0 is an empty dictionary \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\']) \n' + 
-'entity(d2, [prov:type=\'prov:Dictionary\']) \n' + 
-'entity(d3, [prov:type=\'prov:Dictionary\']) \n' + 
+'entity(d0, [prov:type='prov:EmptyDictionary'])    // d0 is an empty dictionary \n' + 
+'entity(d1, [prov:type='prov:Dictionary']) \n' + 
+'entity(d2, [prov:type='prov:Dictionary']) \n' + 
+'entity(d3, [prov:type='prov:Dictionary']) \n' + 
 'entity(e1) \n' + 
 'entity(e2) \n' + 
 'entity(e3) \n' + 
@@ -3020,10 +3031,10 @@
 '      partially known because the dictionary is constructed from partially known \n' + 
 '      other dictionaries. \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(d0, [prov:type=\'prov:EmptyDictionary\'])    // d0 is an empty dictionary \n' + 
-'entity(d1, [prov:type=\'prov:Dictionary\'])     \n' + 
-'entity(d2, [prov:type=\'prov:Dictionary\'])     \n' + 
-'entity(d3, [prov:type=\'prov:Dictionary\'])     \n' + 
+'entity(d0, [prov:type='prov:EmptyDictionary'])    // d0 is an empty dictionary \n' + 
+'entity(d1, [prov:type='prov:Dictionary'])     \n' + 
+'entity(d2, [prov:type='prov:Dictionary'])     \n' + 
+'entity(d3, [prov:type='prov:Dictionary'])     \n' + 
 'entity(e1) \n' + 
 'entity(e2) \n' + 
 ' \n' + 
@@ -3061,7 +3072,7 @@
 '        <span class="name">w3:Consortium</span>: \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(tr:WD-prov-dm-20111215, [ prov:type=\'pr:RecsWD\' ]) \n' + 
+'entity(tr:WD-prov-dm-20111215, [ prov:type='pr:RecsWD' ]) \n' + 
 '</pre> \n' + 
 '      The second version of a document edited by some authors: \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
@@ -3078,7 +3089,7 @@
 '        change the identifier for one of them: \n' + 
 '      </p> \n' + 
 '<pre class="codeexample" xml:space="preserve"> \n' + 
-'entity(tr:WD-prov-dm-20111215, [ prov:type=\'pr:RecsWD\'  ]) \n' + 
+'entity(tr:WD-prov-dm-20111215, [ prov:type='pr:RecsWD'  ]) \n' + 
 'entity(ex:alternate-20111215, [ prov:type="document", ex:version="2" ]) \n' + 
 'alternateOf(tr:WD-prov-dm-20111215,ex:alternate-20111215) \n' + 
 '</pre> \n' + 
@@ -3087,7 +3098,7 @@
 '      drop this discussion \n' + 
 '    </div><div class="note"> \n' + 
 '      Material transplanted from old structural well-formedness constraints \n' + 
-'      section. This example isn\'t very clear, since the sub-workflow-ness isn\'t \n' + 
+'      section. This example isn't very clear, since the sub-workflow-ness isn't \n' + 
 '      represented in the data. According to what was written above, we should \n' + 
 '      conclude that a0 and a2 are equal! \n' + 
 '    </div><div class="anexample"> \n' + 
@@ -3203,7 +3214,7 @@
 '      system, a creator, and content. \n' + 
 '    </div><div class="note"> \n' + 
 '      The following paragraphs are unclear and need to be revised, to address \n' + 
-'      review concerns: if we aren\'t saying anything about how events and time \n' + 
+'      review concerns: if we aren't saying anything about how events and time \n' + 
 '      relate, and time is the only concrete information about event ordering in \n' + 
 '      PROV-DM, then how can implementations check that event ordering \n' + 
 '      constraints are satisfied? \n' + 
--- a/model/prov-dm.html	Tue Jun 19 11:40:39 2012 +0200
+++ b/model/prov-dm.html	Tue Jun 19 04:49:52 2012 -0700
@@ -404,10 +404,10 @@
 extended structures catering for more specific uses of provenance. 
 PROV-DM is organized in six components, respectively dealing with: 
 (1) entities and activities, and the time at which they were created, used, or ended;
-(2) agents bearing responsibility for entities that were generated and activities that happened;
-(3) derivations of entities from entities;
-(4) properties to link entities that refer to the same thing;
-(5) a notion of bundle, a mechanism to support provenance of provenance; and,
+(2) derivations of entities from entities;
+(3) agents bearing responsibility for entities that were generated and activities that happened;
+(4) a notion of bundle, a mechanism to support provenance of provenance; and,
+(5) properties to link entities that refer to the same thing;
 (6) collections forming a logical structure for its members.
 </p>
 
@@ -539,8 +539,8 @@
 The PROV data model has a modular design and is structured according to six components covering various facets of provenance:</p>
 <ul>
 <li> component 1: entities and activities, and the time at which they were created, used, or ended;
-<li> component 2: agents bearing responsibility for entities that were generated and activities that happened;
-<li> component 3: derivations of entities from others;
+<li> component 2: derivations of entities from others;
+<li> component 3: agents bearing responsibility for entities that were generated and activities that happened;
 <li> component 4: bundles, a mechanism to support provenance of provenance;
 <li> component 5: properties to link entities that refer to a same thing;
 <li> component 6: collections forming a logical structure for its members.
@@ -1424,8 +1424,8 @@
 <div id="prov-dm-components-ul">
 <ul>
 <li><b>Component 1: entities and activities.</b> The first component consists of entities, activities, and concepts linking them, such as generation, usage, start, end. The first component is the only one comprising time-related concepts. </li>
-<li><b>Component 2: agents and responsibility.</b> The second component consists of agents and concepts ascribing responsibility to agents.</li>
-<li><b>Component 3: derivations.</b>  The third component is formed with derivations and derivation subtypes.</li>
+<li><b>Component 2: derivations.</b>  The second component is formed with derivations and derivation subtypes.</li>
+<li><b>Component 3: agents and responsibility.</b> The third component consists of agents and concepts ascribing responsibility to agents.</li>
 <li><b>Component 4: bundles.</b> The fourth component is concerned with bundles, a mechanism to support provenance of provenance.</li>
 <li><b>Component 5: alternate.</b> The fifth component consists of relations linking entities referring to the same thing. </li>
 <li><b>Component 6: collections.</b> The sixth component is about collections and concepts capturing their transformation, such as insertion and removal. </li>