Renamed link relations 'hasProvenance', 'hasAnchor' and 'hasQueryService' to 'has_provenance', 'has_anchor' and 'has_query_service' respectively. This is because RFC5988 strongly recommends link relations to be all lowercase.
authorGraham Klyne
Wed, 27 Feb 2013 12:23:11 +0000
changeset 5772 33eea34f1863
parent 5771 dbb3153fe149
child 5773 018e25f63183
Renamed link relations 'hasProvenance', 'hasAnchor' and 'hasQueryService' to 'has_provenance', 'has_anchor' and 'has_query_service' respectively. This is because RFC5988 strongly recommends link relations to be all lowercase.
paq/prov-aq.html
--- a/paq/prov-aq.html	Wed Feb 27 12:38:32 2013 +0100
+++ b/paq/prov-aq.html	Wed Feb 27 12:23:11 2013 +0000
@@ -486,11 +486,11 @@
           For a resource accessible using HTTP, a provenance record may be indicated using an HTTP <code>Link</code> header field, as defined by <a href="http://tools.ietf.org/html/rfc5988#section-5" class="externalRef">Web Linking (RFC 5988)</a> [[LINK-REL]].  The <code>Link</code> header field is included in the HTTP response to a GET or HEAD operation (other HTTP operations are not excluded, but are not considered here).
         </p>
         <p>
-          A <code>hasProvenance</code> link relation type for referencing a provenance record may be used thus:
+          A <code>has_provenance</code> link relation type for referencing a provenance record may be used thus:
         </p>
         <pre class="pattern">
 Link: &lt;<cite>provenance-URI</cite>&gt;;
-  rel="http://www.w3.org/ns/prov#hasProvenance";
+  rel="http://www.w3.org/ns/prov#has_provenance";
   anchor="<cite>entity-URI</cite>"</pre>
         <p>When used in conjunction with an HTTP success response code (<code>2xx</code>), this HTTP header field indicates that <code><cite>provenance-URI</cite></code> is the URI of a provenance record about the originally requested resource, and that the requested resource is identified within the provenance record as <code><cite>entity-URI</cite></code>. (See also <a href="#interpreting-provenance-records" class="sectionRef"></a>.)</p>
         <p>
@@ -500,10 +500,10 @@
           This specification does not define the meaning of these links returned with other HTTP response codes: future revisions may define interpretations for these.
         </p>
         <p>
-          An HTTP response MAY include multiple <code>hasProvenance</code> link header fields, indicating a number of different provenance resources (and anchors) that are known to the responding server, each referencing a provenance record about the accessed resource.
+          An HTTP response MAY include multiple <code>has_provenance</code> link header fields, indicating a number of different provenance resources (and anchors) that are known to the responding server, each referencing a provenance record about the accessed resource.
         </p>
         <p>
-          The presence of a <code>hasProvenance</code> link in an HTTP response does not preclude the possibility that other providers may offer provenance records about the same resource.  In such cases, discovery of the additional provenance records must use other means (e.g. see <a href="#provenance-query-services" class="sectionRef"></a>).
+          The presence of a <code>has_provenance</code> link in an HTTP response does not preclude the possibility that other providers may offer provenance records about the same resource.  In such cases, discovery of the additional provenance records must use other means (e.g. see <a href="#provenance-query-services" class="sectionRef"></a>).
         </p>
         <p>
           An example request including provenance headers in its response might look like this (where <code>C:</code> and <code>S:</code> prefixes indicate client and server emitted data respectively):
@@ -516,7 +516,7 @@
   S: HTTP/1.1 200 OK
   S: Content-type: text/html
   S: Link: &lt;http://example.com/resource/provenance/&gt;; 
-           rel="http://www.w3.org/ns/prov#hasProvenance"; 
+           rel="http://www.w3.org/ns/prov#has_provenance"; 
            anchor="http://example.com/resource/"
   S:
   S: &lt;html ...&gt;
@@ -532,18 +532,18 @@
         <section>
           <h2>Specifying Provenance Query Services</h2>
           <p>
-            The resource provider may indicate that provenance records about the resource are provided by a <a class="internalDFN">provenance query service</a>. This is done through the use of a <code>hasQueryService</code> link relation type following the same pattern as above:
+            The resource provider may indicate that provenance records about the resource are provided by a <a class="internalDFN">provenance query service</a>. This is done through the use of a <code>has_query_service</code> link relation type following the same pattern as above:
           </p>
           <pre class="pattern">
 Link: &lt;<cite>service-URI</cite>&gt;;
-  rel="http://www.w3.org/ns/prov#hasQueryService";
+  rel="http://www.w3.org/ns/prov#has_query_service";
   anchor="<cite>entity-URI</cite>"
           </pre>
           <p>
-            The <code>hasQueryService</code> link identifies the <a class="internalDFN">service-URI</a>.  Dereferencing this URI yields a service description that provides further information to enable a client to submit a query to retrieve a <a class="internalDFN">provenance record</a> for a <a class="internalDFN">resource</a>; see <a href="#provenance-query-services" class="sectionRef"></a> for more details.
+            The <code>has_query_service</code> link identifies the <a class="internalDFN">service-URI</a>.  Dereferencing this URI yields a service description that provides further information to enable a client to submit a query to retrieve a <a class="internalDFN">provenance record</a> for a <a class="internalDFN">resource</a>; see <a href="#provenance-query-services" class="sectionRef"></a> for more details.
           </p>
           <p>
-          There may be multiple <code>hasQueryService</code> link header fields, and these MAY appear in an HTTP response together with <code>hasProvenance</code> link header fields.
+          There may be multiple <code>has_query_service</code> link header fields, and these MAY appear in an HTTP response together with <code>has_provenance</code> link header fields.
           </p>
           <pre class="example code">
   C: GET /resource/ HTTP/1.1
@@ -553,7 +553,7 @@
   S: HTTP/1.1 200 OK
   S: Content-type: text/html
   S: Link: &lt;http://example.com/resource/provenance/&gt;; 
-           rel="http://www.w3.org/ns/prov#hasQueryService"; 
+           rel="http://www.w3.org/ns/prov#has_query_service"; 
            anchor="http://example.com/resource/"
   S:
   S: &lt;html ...&gt;
@@ -592,7 +592,7 @@
   S: HTTP/1.1 200 OK
   S: Content-type: text/html
   S: Link: &lt;http://example.com/resource/provenance/&gt;; 
-           rel="http://www.w3.org/ns/prov#hasProvenance"; 
+           rel="http://www.w3.org/ns/prov#has_provenance"; 
            anchor="http://example.com/resource/20130226/content.html"
   S:
   S: &lt;html&gt;
@@ -611,8 +611,8 @@
           <pre class="pattern">
   &lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
      &lt;head&gt;
-        <b>&lt;link rel="http://www.w3.org/ns/prov#hasProvenance" href="<cite>provenance-URI</cite>"&gt;</b>
-        <b>&lt;link rel="http://www.w3.org/ns/prov#hasAnchor" href="<cite>entity-URI</cite>"&gt;</b>
+        <b>&lt;link rel="http://www.w3.org/ns/prov#has_provenance" href="<cite>provenance-URI</cite>"&gt;</b>
+        <b>&lt;link rel="http://www.w3.org/ns/prov#has_anchor" href="<cite>entity-URI</cite>"&gt;</b>
         &lt;title&gt;Welcome to example.com&lt;/title&gt;
      &lt;/head&gt;
      &lt;body&gt;
@@ -621,16 +621,16 @@
   &lt;/html&gt;</pre>
    </div>
         <p>
-          The <code><cite>provenance-URI</cite></code> given by the first link element (<code>#hasProvenance</code> ) identifies the provenance-URI for the document.
+          The <code><cite>provenance-URI</cite></code> given by the first link element (<code>#has_provenance</code> ) identifies the provenance-URI for the document.
         </p>
         <p>
-          The <code><cite>entity-URI</cite></code> given by the second link element (<code>#hasAnchor</code>) specifies an identifier for the document that may be used within the provenance record when referring to the document.
+          The <code><cite>entity-URI</cite></code> given by the second link element (<code>#has_anchor</code>) specifies an identifier for the document that may be used within the provenance record when referring to the document.
         </p>
         <p>
-          If no <code><cite>entity-URI</cite></code> is provided (via a <code>#hasAnchor</code> link element) then is it is assumed to be the URI of the document. It is RECOMMENDED that this convention be used only when the document has a  URI that is reasonably expected to be known or easily discoverable by a consumer of the document (e.g. when delivered from a web server, or as part of a MIME structure containing content identifiers [[RFC2392]]).
+          If no <code><cite>entity-URI</cite></code> is provided (via a <code>#has_anchor</code> link element) then is it is assumed to be the URI of the document. It is RECOMMENDED that this convention be used only when the document has a  URI that is reasonably expected to be known or easily discoverable by a consumer of the document (e.g. when delivered from a web server, or as part of a MIME structure containing content identifiers [[RFC2392]]).
         </p>
         <p>
-          An HTML document header MAY present multiple <code><cite>provenance-URI</cite></code>s over several <code>#hasProvenance</code> link elements, indicating a number of different provenance records that are known to the publisher of the document, each of which may provide provenance about the document (see <a href="#interpreting-provenance-records" class="sectionRef"></a>).
+          An HTML document header MAY present multiple <code><cite>provenance-URI</cite></code>s over several <code>#has_provenance</code> link elements, indicating a number of different provenance records that are known to the publisher of the document, each of which may provide provenance about the document (see <a href="#interpreting-provenance-records" class="sectionRef"></a>).
         </p>
         <p class="TODO">
           Check with Dong:  I think the cross reference should make the assumptions explicit.  I, too, feel this material is not strictly needed, but was previously asked to add some clarification about mutliple links.
@@ -644,8 +644,8 @@
             <pre class="pattern">
   &lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
      &lt;head&gt;
-        <b>&lt;link rel="http://www.w3.org/ns/prov#hasQueryService" href="<cite>service-URI</cite>"&gt;</b>
-        <b>&lt;link rel="http://www.w3.org/ns/prov#hasAnchor" href="<cite>entity-URI</cite>"&gt;</b>
+        <b>&lt;link rel="http://www.w3.org/ns/prov#has_query_service" href="<cite>service-URI</cite>"&gt;</b>
+        <b>&lt;link rel="http://www.w3.org/ns/prov#has_anchor" href="<cite>entity-URI</cite>"&gt;</b>
         &lt;title&gt;Welcome to example.com&lt;/title&gt;
      &lt;/head&gt;
      &lt;body&gt;
@@ -653,10 +653,10 @@
      &lt;/body&gt;
   &lt;/html&gt;</pre>
           <p>
-            The <code>hasQueryService</code> link element identifies the <a class="internalDFN">service-URI</a>.  Dereferencing this URI yields a service description that provides further information to enable a client to query for provenance about a resource; see <a href="#provenance-query-services" class="sectionRef"></a> for more details.
+            The <code>has_query_service</code> link element identifies the <a class="internalDFN">service-URI</a>.  Dereferencing this URI yields a service description that provides further information to enable a client to query for provenance about a resource; see <a href="#provenance-query-services" class="sectionRef"></a> for more details.
           </p>
           <p>
-            There MAY be multiple <code>#hasQueryService</code> link elements, and these MAY appear in the same document as <code>#hasProvenance</code> link elements (though we do not anticipate that <code>#hasProvenance</code> and <code>#hasQueryService</code> link relations will commonly be used together).
+            There MAY be multiple <code>#has_query_service</code> link elements, and these MAY appear in the same document as <code>#has_provenance</code> link elements (though we do not anticipate that <code>#has_provenance</code> and <code>#has_query_service</code> link relations will commonly be used together).
           </p>
         <p class="TODO">
           Check with Dong:  This test was already revised in response to earlier comment.
@@ -670,24 +670,24 @@
       <section>
         <h2>Resource represented as RDF</h2>
         <p>
-          If a resource is represented as RDF (in any of its recognized syntaxes, including RDFa), it may contain references to its own provenance using additional RDF statements.  For this purpose the link relations introduced above (<a href="#locating-provenance-records" class="sectionRef"></a>) may be used as RDF properties: <code>prov:hasProvenance</code>, <code>prov:hasAnchor</code>, and <code>prov:hasQueryService</code>, where the <code>prov:</code> prefix here indicates the PROV namespace URI <code>http://www.w3.org/ns/prov#</code>.
+          If a resource is represented as RDF (in any of its recognized syntaxes, including RDFa), it may contain references to its own provenance using additional RDF statements.  For this purpose the link relations introduced above (<a href="#locating-provenance-records" class="sectionRef"></a>) may be used as RDF properties: <code>prov:has_provenance</code>, <code>prov:has_anchor</code>, and <code>prov:has_query_service</code>, where the <code>prov:</code> prefix here indicates the PROV namespace URI <code>http://www.w3.org/ns/prov#</code>.
         </p>
         <p>
-          The RDF property <code>prov:hasProvenance</code> is a relation between two resources, where the object of the property is a <a class="internalDFN">provenance-URI</a> that denotes a provenance record about the subject resource.  Multiple <code>prov:hasProvenance</code> assertions may be made about a subject resource.
+          The RDF property <code>prov:has_provenance</code> is a relation between two resources, where the object of the property is a <a class="internalDFN">provenance-URI</a> that denotes a provenance record about the subject resource.  Multiple <code>prov:has_provenance</code> assertions may be made about a subject resource.
         </p>
         <p>
-          Property <code>prov:hasAnchor</code> specifies an <a class="internalDFN">entity-URI</a> used in the indicated provenance to refer to the containing RDF document.
+          Property <code>prov:has_anchor</code> specifies an <a class="internalDFN">entity-URI</a> used in the indicated provenance to refer to the containing RDF document.
         </p>
         <p>
-          Property <code>prov:hasQueryService</code> specifies a <a class="internalDFN">service-URI</a> for provenance queries.
+          Property <code>prov:has_query_service</code> specifies a <a class="internalDFN">service-URI</a> for provenance queries.
         </p>
         <pre class="example code">
     @prefix prov: &lt;http://www.w3.org/ns/prov#&gt;.
 
     &lt;&gt; dcterms:title        "Welcome to example.com" ;
-       prov:hasAnchor       &lt;http://example.com/data/resource.rdf&gt; ;
-       prov:hasProvenance   &lt;http://example.com/provenance/resource.rdf&gt; ;
-       prov:hasQueryService &lt;http://example.com/provenance-query-service/&gt; .
+       prov:has_anchor       &lt;http://example.com/data/resource.rdf&gt; ;
+       prov:has_provenance   &lt;http://example.com/provenance/resource.rdf&gt; ;
+       prov:has_query_service &lt;http://example.com/provenance-query-service/&gt; .
 
        # (More RDF data ...)
 
@@ -696,7 +696,7 @@
           (The above example uses Turtle RDF syntax [[TURTLE]].)
         </p>          
         <p class="note">
-          These terms (<code>prov:hasProvenance</code>, <code>prov:hasAnchor</code>, and <code>prov:hasQueryService</code>) may be also used in RDF statements with other subjects to indicate provenance of other resources, but discussion of such use is beyond the scope of this document.
+          These terms (<code>prov:has_provenance</code>, <code>prov:has_anchor</code>, and <code>prov:has_query_service</code>) may be also used in RDF statements with other subjects to indicate provenance of other resources, but discussion of such use is beyond the scope of this document.
         </p>
       </section>
 
@@ -940,14 +940,14 @@
           Previously, <a href="#locating-provenance-records" class="sectionRef"></a> has described use of HTTP <code>Link:</code> header fields, HTML <code>&lt;link&gt;</code> elements and RDF statements to indicate provenance query services. Beyond that, this specification does not define any specific mechanism for discovering query services.  Applications may use any appropriate mechanism, including but not limited to: prior configuration, search engines, service registries, etc.
         </p>
         <p>
-          To facilitate service discovery, we recommend that RDF publication of dataset and service descriptions use the property <code>prov:hasQueryService</code> and the provenance service type <code>prov:ServiceDescription</code> as appropriate (see the appendix <a href="#prov-namespace" class="sectionRef"></a>).
+          To facilitate service discovery, we recommend that RDF publication of dataset and service descriptions use the property <code>prov:has_query_service</code> and the provenance service type <code>prov:ServiceDescription</code> as appropriate (see the appendix <a href="#prov-namespace" class="sectionRef"></a>).
         </p>
         <p>
           For example, a VoID description [[VoID]] of a dataset might indicate a provenance query service providing information about that dataset:
         </p>
         <pre class="pattern">
   &lt;http://example.org/dataset/&gt; a void:Dataset ;
-    prov:hasQueryService &lt;http://example.org/provenance/&gt; .</pre>
+    prov:has_query_service &lt;http://example.org/provenance/&gt; .</pre>
         <p>
           The RDF service description example in <a href="#service-description-example" class="sectionRef"></a> shows use of the <code>prov:ServiceDescription</code> type.
         </p>
@@ -987,7 +987,7 @@
         The ability to answer forward-looking questions requires some cooperation among the parties who use a resource; for example, a consumer could report use directly to the publisher, or a search engine could discover and report such downstream resource usage.  To facilitate such cooperation, a publisher of a resource may implement a "ping-back" capability.
       </p>
       <p>
-        A resource may have an associated "ping-back" URI which can be presented with PROV assertions about the resource.  The ping-back URI is associated with a resource using mechanisms similar to those used for presenting a <a class="internalDFN">provenance-URI</a>, but using a <code>pingback</code> link relation instead of <code>hasProvenance</code>.  A consumer of the resource, or some other system, may  perform an HTTP POST operation to the pingback URI where the POST request body contains provenance in one of the recognized provenance formats.  For interoperability, a ping-back receiving service SHOULD be able to accept at least PROV-O provenance presented as RDF/XML or Turtle.
+        A resource may have an associated "ping-back" URI which can be presented with PROV assertions about the resource.  The ping-back URI is associated with a resource using mechanisms similar to those used for presenting a <a class="internalDFN">provenance-URI</a>, but using a <code>pingback</code> link relation instead of <code>has_provenance</code>.  A consumer of the resource, or some other system, may  perform an HTTP POST operation to the pingback URI where the POST request body contains provenance in one of the recognized provenance formats.  For interoperability, a ping-back receiving service SHOULD be able to accept at least PROV-O provenance presented as RDF/XML or Turtle.
       </p>
       <p>
         For example, consider a resource that is published by <code>acme.example.com</code>, and is subsequently used by <code>wile-e.example.org</code> in the construction of some new entity;  we might see an exchange along the following lines.  We start with <code>wile-e.example.org</code> retrieving a copy of <code>acme.example.org</code>'s resource:
@@ -998,13 +998,13 @@
 
   S: 200 OK
   S: Link: &lt;http://acme.example.org/provenance/super-widget&gt;; 
-           rel=http://www.w3.org/ns/prov#hasProvenance
+           rel=http://www.w3.org/ns/prov#has_provenance
   S: Link: &lt;http://acme.example.org/pingback/super-widget&gt;; 
            rel=http://www.w3.org/ns/prov#pingback
    :
   (super-widget resource data)</pre>
       <p>
-        The first of the links in the response is a <code>hasProvenance</code> link with a <a class="internalDFN">provenance-URI</a> that has been described previously (<a href="#resource-accessed-by-http" class="sectionRef"></a>).  The second is a distinct resource that exists to receive provenance pingbacks.  Later, when a new resource has been created or action performed based upon the <code>acme.example.org/super-widget</code>, a client MAY post a pingback request to any supplied <code>prov:pingback</code> URI:
+        The first of the links in the response is a <code>has_provenance</code> link with a <a class="internalDFN">provenance-URI</a> that has been described previously (<a href="#resource-accessed-by-http" class="sectionRef"></a>).  The second is a distinct resource that exists to receive provenance pingbacks.  Later, when a new resource has been created or action performed based upon the <code>acme.example.org/super-widget</code>, a client MAY post a pingback request to any supplied <code>prov:pingback</code> URI:
       </p>
       <pre class="example code">
   C: POST /pingback/super-widget HTTP/1.1
@@ -1016,7 +1016,7 @@
 
   S: 204 No Content
   S: Link: &lt;http://acme.example.org/provenance/super-widget&gt;; 
-           rel=http://www.w3.org/ns/prov#hasProvenance;
+           rel=http://www.w3.org/ns/prov#has_provenance;
            anchor="http://acme.example.org/super-widget"
 </pre>
 
@@ -1027,10 +1027,10 @@
         <br/>
         <code><pre>
   S: Link: &lt;http://wile-e.example.org/contraption/provenance&gt;;
-           rel=http://www.w3.org/ns/prov#hasProvenance;
+           rel=http://www.w3.org/ns/prov#has_provenance;
            anchor=http://acme.example.org/super-widget
   S: Link: &lt;http://wile-e.example.org/another/provenance&gt;;
-           rel=http://www.w3.org/ns/prov#hasProvenance;
+           rel=http://www.w3.org/ns/prov#has_provenance;
            anchor=http://acme.example.org/super-widget
         </pre></code>
       </p>
@@ -1040,12 +1040,12 @@
       <p>
         The pingback requests contains a list of <a class="internalDFN">provenance-URI</a>s from which forward provenance may be retrieved.  The pingback service may do as it chooses with these URIs; e.g., it may choose to save them for later use, to retrieve the associated provenance and save that, or to publish the URIs along with other provenance information about the original entity to which they relate.
       </p>
-      <p>The client MAY supply <code>#hasQueryService</code> <code>Link:</code> headers that indicate services which can describe the target-URI. The anchor MUST be included, and SHOULD be the target-URI of the resource which this pingback service belongs to, unless the submitted query service would expect a different target-URI to describe the given resource.
+      <p>The client MAY supply <code>#has_query_service</code> <code>Link:</code> headers that indicate services which can describe the target-URI. The anchor MUST be included, and SHOULD be the target-URI of the resource which this pingback service belongs to, unless the submitted query service would expect a different target-URI to describe the given resource.
       </p>
       <pre class="example code">
   C: POST http://acme.example.org/pingback/super-widget HTTP/1.1
   C: Link: &lt;http://wile-e.example.org/sparql&gt;;
-           rel="http://www.w3.org/ns/prov#hasQueryService";
+           rel="http://www.w3.org/ns/prov#has_query_service";
            anchor="http://acme.example.org/pingback/super-widget"
   C: Content-Type: text/uri-list
   C: Content-Length: 0
@@ -1053,13 +1053,13 @@
 
   S: 204 No Content
   S: Link: &lt;http://acme.example.org/provenance/super-widget&gt;; 
-           rel=http://www.w3.org/ns/prov#hasProvenance;
+           rel=http://www.w3.org/ns/prov#has_provenance;
            anchor="http://acme.example.org/super-widget"
 </pre>
       <p>
         In the above example, the client did not submit any provenance-URIs and the URI list is therefore empty.
       </p>
-      <p>The client MAY similarly include <code>#hasProvenance</code> <code>Link:</code> headers to specify a different anchor. The provenance-URIs of those headers SHOULD also be included in the content if the POSTed Content-Type is <code>text/uri-list</code>.
+      <p>The client MAY similarly include <code>#has_provenance</code> <code>Link:</code> headers to specify a different anchor. The provenance-URIs of those headers SHOULD also be included in the content if the POSTed Content-Type is <code>text/uri-list</code>.
       </p>
       <p class="TODO">
         I've downplayed MUST to SHOULD in the last.  If the content is empty, should the Content-type be omitted?  (see example above).  I would be inclined to makje it optional, and omit it from the example.
@@ -1093,7 +1093,7 @@
       for this purpose POST an empty text/uri-list to avoid side effects.
 
       The server SHOULD indicate immediate acceptance by including the
-      corresponding {prov:hasProvenance} {Link} headers for the accepted
+      corresponding {prov:has_provenance} {Link} headers for the accepted
       *provenance-URI*s. If all submitted provenance-URIs have been
       immediately accepted, the server SHOULD respond with HTTP status {200
       OK} or {204 No Content}.
@@ -1101,7 +1101,7 @@
       If server acceptance is pending for any of the submitted URIs, for
       instance because the provenance-URIs are being validated or due to be
       approved by a moderator, the server SHOULD respond with HTTP status
-      {202 Accepted}, and only include corresponding {prov:hasProvenance}
+      {202 Accepted}, and only include corresponding {prov:has_provenance}
       {Link} headers for those provenance-URIs that have been immediately
       accepted.
 
@@ -1111,7 +1111,7 @@
       accept one or more of the submitted provenance-URIs or
       provenance-service-URIs. If some URIs were accepted, but others were
       refused, the server SHOULD respond with {403 Forbidden} and include
-      generated prov:hasProvenance and prov:hasQueryService Link headers for
+      generated prov:has_provenance and prov:has_query_service Link headers for
       the immediately accepted URIs.
 
       -->
@@ -1146,7 +1146,7 @@
       <p class="TODO">
         Is CSRF a real threat here?  How?
       </p>
-      <p>Accessing provenance services might reveal to the service and third-parties information which is considered private, including which resources a client has taken interest in. For instance, a browser extension which collects all provenance data for a resource which is being saved to the local disk, could be revealing user interest in a sensitive resource to a third-party site listed by <code>prov:hasProvenance</code> or <code>prov:hasQueryService</code> relation. A detailed query submitted to a third-party provenance query service might be revealing personal information such as social security numbers.  Accordingly, user agents in particular SHOULD NOT follow provenance and provenance service links without first obtaining the user's explicit permission to do so.
+      <p>Accessing provenance services might reveal to the service and third-parties information which is considered private, including which resources a client has taken interest in. For instance, a browser extension which collects all provenance data for a resource which is being saved to the local disk, could be revealing user interest in a sensitive resource to a third-party site listed by <code>prov:has_provenance</code> or <code>prov:has_query_service</code> relation. A detailed query submitted to a third-party provenance query service might be revealing personal information such as social security numbers.  Accordingly, user agents in particular SHOULD NOT follow provenance and provenance service links without first obtaining the user's explicit permission to do so.
       </p>
     </section>
  
@@ -1193,18 +1193,18 @@
           <td><a href="#direct-http-query-service-description" class="sectionRef"></a></td>
         </tr>
         <tr style="vertical-align: top;">
-          <td><code>hasAnchor</code></td>
+          <td><code>has_anchor</code></td>
           <td>Indicates an <a class="internalDFN">entity-URI</a> for an <a class="internalDFN">entity</a>, used by an associated provenance record.</td>
           <td><a href="#resource-represented-as-html" class="sectionRef"></a>, <a href="#resource-represented-as-rdf" class="sectionRef"></a></td>
         </tr>
         <tr style="vertical-align: top;">
-          <td><code>hasProvenance</code></td>
+          <td><code>has_provenance</code></td>
           <td>Indicates a <a class="internalDFN">provenance-URI</a> for a resource;  the resource identified by this property presents a provenance record about its subject or anchor resource.
           </td>
           <td><a href="#resource-accessed-by-http" class="sectionRef"></a>, <a href="#resource-represented-as-html" class="sectionRef"></a></td>
         </tr>
         <tr style="vertical-align: top;">
-          <td><code>hasQueryService</code></td>
+          <td><code>has_query_service</code></td>
           <td>Indicates a <a class="internalDFN">provenance query service</a> that can access provenance related to its subject or anchor resource.</td>
           <td><a href="#specifying-provenance-query-services" class="sectionRef"></a></td>
         </tr>
@@ -1262,7 +1262,7 @@
         Update copy of mercurial change log, changes since 19 June.
         <!--
             hg log -r tip:d0af0446868d \
-              --template "<dt>{date|isodate} {node|short} {author}</dt><dd>{desc}</dd>\n" \
+              - -template "<dt>{date|isodate} {node|short} {author}</dt><dd>{desc}</dd>\n" \
               prov-aq.html
           -->
       </p>
@@ -1282,7 +1282,7 @@
   <dt>2013-01-10 15:43 +0100 cb49c07522ff Paul Groth <[email protected]></dt><dd>updated to fix minor editorial errors</dd>
   <dt>2013-01-04 14:23 +0000 47a1f3baf67a Graham Klyne</dt><dd>Editorial tweaks</dd>
   <dt>2013-01-04 13:26 +0000 a374c48027b9 Graham Klyne</dt><dd>Separate prov:DirectQueryService (specifric mechanism) from prov:ProvenanceQueryService (generic)</dd>
-  <dt>2013-01-04 13:11 +0000 7b4580bd6d52 Graham Klyne</dt><dd>Fix some section cross-references; rename 'prov:hasProvenanceService' as 'prov:hasQueryService'</dd>
+  <dt>2013-01-04 13:11 +0000 7b4580bd6d52 Graham Klyne</dt><dd>Fix some section cross-references; rename 'prov:has_provenanceService' as 'prov:has_query_service'</dd>
   <dt>2013-01-04 13:03 +0000 f00efdbb4f6e Graham Klyne</dt><dd>Reorganize provenance query service description to accommodate SPARQL (ISSUE 601); 'rename provenance service' as 'provenance query service'; rename 'prov:ProvenanceService' as 'prov:ProivenanceQueryService'</dd>
   <dt>2012-12-10 22:40 +0000 08deb1462a7c Graham Klyne</dt><dd>Fix apostrophe</dd>
   <dt>2012-12-10 19:03 +0000 f0f315c6781c Graham Klyne</dt><dd>Fold in Jun's editorial comments.  Remove reference to POWDER</dd>
@@ -1292,7 +1292,7 @@
   <dt>2012-11-26 11:08 +0000 b811ccb53b45 Graham Klyne</dt><dd>Update forward provenance (pingback) in response to comments; fix text around VoID example</dd>
   <dt>2012-11-20 16:00 +0000 839d503bd064 Graham Klyne</dt><dd>Added specification for pingback link header (ISSUE 600)</dd>
   <dt>2012-11-20 14:15 +0000 0e668b4ce436 Graham Klyne</dt><dd>Tidy up some text</dd>
-  <dt>2012-11-20 14:03 +0000 3cba6f76b797 Graham Klyne</dt><dd>Expanded discussion of provenance service discovery to include prov:hasProvenanceService</dd>
+  <dt>2012-11-20 14:03 +0000 3cba6f76b797 Graham Klyne</dt><dd>Expanded discussion of provenance service discovery to include prov:has_provenanceService</dd>
   <dt>2012-11-20 12:22 +0000 44586518f842 Graham Klyne</dt><dd>Remove speculative non-specification text to be covered in FAQ (ISSUES 426, 598)</dd>
   <dt>2012-11-20 11:36 +0000 2f1a8ca558a8 Graham Klyne</dt><dd>Added section with table of URIs and what they dereference to (ISSUE 424)</dd>
   <dt>2012-11-20 10:37 +0000 d2acceb63c0b Graham Klyne</dt><dd>Make treatment of direct retrieval and service for provenance access more equally visible (ISSUE 422)</dd>