--- a/model/prov-dm.html Sat Nov 10 05:53:40 2012 -0500
+++ b/model/prov-dm.html Sat Nov 10 05:59:00 2012 -0500
@@ -540,20 +540,6 @@
-<!-- <div class="buttonpanel">
-<form action="#"><p>
-<input id="hide-asn" onclick="set_display_by_class('div','withAsn','none');set_display_by_class('span','withAsn','none'); set_display_by_id('hide-asn','none'); set_display_by_id('show-asn','');" type="button"
-value="Hide ASN" />
-<input id="show-asn" onclick="set_display_by_class('div','withAsn',''); set_display_by_class('span','withAsn',''); set_display_by_id('hide-asn',''); set_display_by_id('show-asn','none');" style="display: none"
-type="button" value="Show ASN" />
-</p>
-</form>
-</div>
--->
-
-
-
-
<section id="introduction">
<h2>Introduction<br>
@@ -761,14 +747,6 @@
-<!--
-<p><a href="#prov-core-structures">Figure 1</a> is not intended to be complete: it only illustrates types and relations introduced in this section (<a href="#section-prov-overview">Section 2</a>), exploited in the example discussed in <a href="#prov-dm-example">Section 3</a>, and explained in detail in <a href="#data-model-components">Section 4</a>.
-Names of relations depicted in <a href="#prov-core-structures">Figure 1</a>
-are listed in
-the third column of <a href="#overview-types-and-relations">Table 2</a>. These names are part of a textual notation to write instances of the PROV data model, which we introduce in the next section. </p>
-
--->
-
@@ -967,13 +945,6 @@
</p>
-<!--
-<p>
-The definition of agent intentionally stays away from using concepts such as enabling, causing, initiating, triggering, affecting, etc, because many entities also enable, cause, initiate, and affect in some way
-the activities. (Concepts such as triggers are themselves defined later in relations between entities and activities.) So the notion of having some degree of responsibility is really what makes an agent.</p>
--->
-
-
<div class="anexample conceptexample" id="agent-example">
<p>
@@ -997,8 +968,6 @@
<p>
Agents are defined as having some kind of responsibility for activities. </p>
-<!-- <div class="note">Proposal: remove the above para as it repeats from 2.3. Proposed text: "the <em>activity association</em> relation provides a way to indicate that an agent is responsible for an activity, possibly with an associated plan."[PM]</div> -->
-
<p>
<span class="glossary-ref" data-ref="glossary-core-association" data-withspan="true"></span>
@@ -1531,7 +1500,7 @@
</ul>
</div>
-<!-- TODO: update map for linking -->
+
<div style="text-align: center;">
<figure style="max-width: 95%; ">
@@ -1699,14 +1668,6 @@
</pre>
states the existence of an entity, denoted by identifier <span class="name">tr:WD-prov-dm-20111215</span>, with type <span class="name">document</span> and version number <span class="name">2</span>. The attribute <span class="name">ex:version</span> is application specific, whereas the attribute <span
class="name">type</span> (see <a href="#term-attribute-type">Section 5.7.4.4</a>) is reserved in the <a title="prov-namespace">PROV namespace</a>.
-<!--The following expression</p>
-<pre class="codeexample">
-entity(tr:WD-prov-dm-20111215, [ prov:type="document", ex:version="2" ])
-entity(e0, [ prov:type="File", ex:path="/shared/crime.txt", ex:creator="Alice" ])
-</pre>
-states the existence of an entity, denoted by identifier <span class="name">e0</span>, with type <span class="name">File</span> and path <span class="name">/shared/crime.txt</span> in the
-file system, and creator alice. The attributes <span class="name">path</span> and <span class="name">creator</span> are application specific, whereas the attribute <span
-class="name">type</span> is reserved in the PROV namespace.-->
</div>
@@ -3230,13 +3191,6 @@
The normative definitions of these datatypes are provided by their respective specifications.
</p>
-<!--
-<p>PROV accepts the types that RDF enumerates in
-its own specification [[!RDF-CONCEPTS]]. New RDF releases
-[[RDF-CONCEPTS11]] may extend the list of datatypes, and PROV would
-naturally accept those too.</p>
--->
-
<p id="conformance-to-rdf-datatypes"><b>Conformance to RDF Datatypes</b> As of the publication of this document, RDF 1.1 Concepts and Abstract Syntax [[RDF-CONCEPTS11]] is not yet a W3C Recommendation (see <a href="http://www.w3.org/TR/rdf11-concepts/">http://www.w3.org/TR/rdf11-concepts/</a> for the latest version).
@@ -3257,78 +3211,6 @@
-<!--
-
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-data-types">Table 9: Informative List of PROV-DM Data Types</caption>
-
-
- <tbody><tr><th></th><th>Datatype</th><th>Value space</th></tr>
-
- <tr><th rowspan="4">Core types</th><td><a href="http://www.w3.org/TR/xmlschema11-2/#string"><span class="name">xsd:string</span></a></td><td>Character strings</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#boolean"><span class="name">xsd:boolean</span></a></td><td>true, false</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#decimal"><span class="name">xsd:decimal</span></a></td><td>Arbitrary-precision decimal numbers</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#integer"><span class="name">xsd:integer</span></a></td><td>Arbitrary-size integer numbers</td></tr>
-
- <tr><th rowspan="2">IEEE floating-point<br>numbers</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#double"><span class="name">xsd:double</span></a></td><td>64-bit floating point numbers incl. ±Inf, ±0, NaN</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#float"><span class="name">xsd:float</span></a></td><td>32-bit floating point numbers incl. ±Inf, ±0, NaN</td></tr>
-
- <tr><th rowspan="4">Time and date</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#date"><span class="name">xsd:date</span></a></td><td>Dates (yyyy-mm-dd) with or without timezone</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#time"><span class="name">xsd:time</span></a></td><td>Times (hh:mm:ss.sss…) with or without timezone</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#dateTime"><span class="name">xsd:dateTime</span></a></td><td>Date and time with or without timezone</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#dateTimeStamp"><span class="name">xsd:dateTimeStamp</span></a></td><td>Date and time with required timezone</td></tr>
-
- <tr><th rowspan="8">Recurring and<br>partial dates</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#gYear"><span class="name">xsd:gYear</span></a></td><td>Gregorian calendar year</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#gMonth"><span class="name">xsd:gMonth</span></a></td><td>Gregorian calendar month</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#gDay"><span class="name">xsd:gDay</span></a></td><td>Gregorian calendar day of the month</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#gYearMonth"><span class="name">xsd:gYearMonth</span></a></td><td>Gregorian calendar year and month</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#gMonthDay"><span class="name">xsd:gMonthDay</span></a></td><td>Gregorian calendar month and day</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#duration"><span class="name">xsd:duration</span></a></td><td>Duration of time</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#yearMonthDuration"><span class="name">xsd:yearMonthDuration</span></a></td><td>Duration of time (months and years only)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#dayTimeDuration"><span class="name">xsd:dayTimeDuration</span></a></td><td>Duration of time (days, hours, minutes, seconds only)</td></tr>
-
- <tr><th rowspan="12">Limited-range<br>integer numbers</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#byte"><span class="name">xsd:byte</span></a></td><td>-128…+127 (8 bit)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#short"><span class="name">xsd:short</span></a></td><td>-32768…+32767 (16 bit)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#int"><span class="name">xsd:int</span></a></td><td>-2147483648…+2147483647 (32 bit)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#long"><span class="name">xsd:long</span></a></td><td>-9223372036854775808…+9223372036854775807 (64 bit)</td></tr>
-
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedByte"><span class="name">xsd:unsignedByte</span></a></td><td>0…255 (8 bit)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedShort"><span class="name">xsd:unsignedShort</span></a></td><td>0…65535 (16 bit)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedInt"><span class="name">xsd:unsignedInt</span></a></td><td>0…4294967295 (32 bit)</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedLong"><span class="name">xsd:unsignedLong</span></a></td><td>0…18446744073709551615 (64 bit)</td></tr>
-
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#positiveInteger"><span class="name">xsd:positiveInteger</span></a></td><td>Integer numbers >0</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#nonNegativeInteger"><span class="name">xsd:nonNegativeInteger</span></a></td><td>Integer numbers ≥0</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#negativeInteger"><span class="name">xsd:negativeInteger</span></a></td><td>Integer numbers <0</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#nonPositiveInteger"><span class="name">xsd:nonPositiveInteger</span></a></td><td>Integer numbers ≤0</td></tr>
-
- <tr><th rowspan="2">Encoded binary data</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#hexBinary"><span class="name">xsd:hexBinary</span></a></td><td>Hex-encoded binary data</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#base64Binary"><span class="name">xsd:base64Binary</span></a></td><td>Base64-encoded binary data</td></tr>
-
- <tr><th rowspan="6">Miscellaneous<br>XSD types</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#language"><span class="name">xsd:language</span></a></td><td>Language tags per [<cite><a class="bibref" rel="biblioentry" href="#bib-BCP47">BCP47</a></cite>]</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#normalizedString"><span class="name">xsd:normalizedString</span></a></td><td>Whitespace-normalized strings</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#token"><span class="name">xsd:token</span></a></td><td>Tokenized strings</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#NMTOKEN"><span class="name">xsd:NMTOKEN</span></a></td><td>XML NMTOKENs</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#Name"><span class="name">xsd:Name</span></a></td><td>XML Names</td></tr>
- <tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#NCName"><span class="name">xsd:NCName</span></a></td><td>XML NCNames</td></tr>
-
- <tr><th rowspan="2">Qualified<br>Names or URIs</th>
- <td><a href="http://www.w3.org/TR/xmlschema11-2/#anyURI"><span class="name">xsd:anyURI</span></a></td><td>Absolute or relative URIs and IRIs</td></tr>
- <tr><td><a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME"><span class="name">prov:QUALIFIED_NAME</span></a></td><td>PROV qualified name</td></tr>
-
- <tr><th rowspan="2">RDF XML/HTML Literals</th>
- <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral"><span class="name">rdf:XMLLiteral</span></a></td><td>XML content as a value</td></tr>
- <tr><td><a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML"><span class="name">rdf:HTML</span></a></td><td>HTML content as a value</td></tr>
-
-</td>
- </tbody></table>
--->
<div class="anexample" id="anexample-value">
<p>
@@ -3700,20 +3582,9 @@
<td><code><a href="http://www.w3.org/TR/2012/WD-prov-n-20120724/#prod-specializationExpression">specializationExpression</a></code></td>
</tr>
-<!--
-<tr class="component5-color">
-<td><a title="Mention">Mention</a></td>
-<td><a href="http://www.w3.org/TR/2012/WD-prov-o-20120724/#mentionOf">mentionOf</a>, <a href="http://www.w3.org/TR/2012/WD-prov-o-20120724/#asInBundle">asInBundle</a></td>
-<td><code><a href="http://www.w3.org/TR/2012/WD-prov-n-20120724/#prod-mentionExpression">mentionExpression</a></code></td>
-</tr>
--->
-
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td>
</tr>
-
-
-
<tr class="component6-color">
<td><a title="Collection">Collection</a></td>
<td><a href="http://www.w3.org/TR/2012/WD-prov-o-20120724/#Collection">Collection</a></td>