--- a/paq/prov-aq.html	Fri Nov 16 16:01:49 2012 +0000
+++ b/paq/prov-aq.html	Fri Nov 16 16:29:25 2012 +0000
@@ -552,8 +552,6 @@
       <!-- <section class="informative"> -->
       <section>
         <h2>Provenance service description</h2>
-        <!--<p>The provenance service interface as described above violates REST constraints by requiring the client to know about the structure of URIs offered by the service (see [[REST-APIs]], 4th bullet point).  The provenance service description mitigates this coupling by providing a mechanism for discovering the URI format to be used, starting with just the service URI.
-        %</p> -->
         <p>Dereferencing a provenance service URI should yield a provenance service description. This is to be compatible with the constraints of [[REST-APIs]]. The provenance service description should be available as RDF (in any of its common serializations, and determined through HTTP content negotiation), and it should contain RDF statements of the form:
         </p>
         <pre class="pattern">
@@ -561,13 +559,10 @@
     prov:provenanceUriTemplate "<cite>service-URI</cite>?target={+uri}" .</pre>
         <p>where <cite><code>service-URI</code></cite> is the URI of the provenance service.  Note that the object of the <code>prov:provenanceUriTemplate</code> statement is a literal text value, not a URI.
         </p>
-        <p>A client may retrieve this service description and extract the associated value for <code>prov:provenance-URI-template</code>.  This value is a string containing a URI template [[URI-template]] (level 2). A URI for the desired provenance information is obtained by expanding the URI template with the variable <code>uri</code> set to the resource-URI for which provenance is required.  If the target-URI contains '#' or '&amp;' these  must be %-escaped as <code>%23</code> or <code>%26</code> respectively before template expansion.
+        <p>A client may retrieve this service description and extract the associated value for <code>prov:provenance-URI-template</code>.  This value is a string containing a URI template [[URI-template]] (level 2). A URI for the desired provenance information is obtained by expanding the URI template with the variable <code>uri</code> set to the resource-URI for which provenance is required.  If the target-URI contains '#' or '&amp;' these  must be %-escaped as <code>%23</code> or <code>%26</code> respectively before template expansion [[RFC3986]].
         </p>
         <p>While use of RDF for service descriptions is a recommended option, this specification does not preclude the use of non-RDF formats that a service may choose to offer, and which can be selected using HTTP content negotiation.
         </p>
-        <p class="TODO">
-          @@TODO: sync up term definitions with provenance ontology specification.
-        </p>
       </section>
 
     </section>
@@ -727,46 +722,40 @@
     
     <section class='appendix'>
       <h2>Names added to prov: namespace</h2>
-      <p class="TODO">
-          @@TODO Create table of URIs introduced, and what they mean.  Use some material from IANA considerations.  Consider separate tables for classes and properties.  Mainly need to add document cross-references, and review.
-      </p>
 
       <p>
-        This specification defines the following additional names in the provenance namespace.
-      </p>
-      
-      <p>
-        The provenance namespace URI is http://www.w3.org/ns/prov#.
+        This specification defines the following additional names in the provenance namespace
+        with URI <a href="http://www.w3.org/ns/prov#">http://www.w3.org/ns/prov#</a>.
       </p>
         <table>
           <tr>
-            <th>Name</th><th>Description</th><th>Ref</th>
+            <th>Name</th><th>Description</th><th>Definition ref</th>
           </tr>
           <tr>
             <td>ProvenanceService</td>
-            <td>Class for a service described by a provenance service description, mainly for use in RDF service descriptions.</td>
-            <td>@@ref</td>
+            <td>Class for a provenance service. Mainly for use in RDF provenance service descriptions, to facilitate discover..</td>
+            <td><a href="#provenance-service-description" class="sectionRef"></a></td>
           </tr>
           <tr>
             <td>hasAnchor</td>
             <td>Indicates a <a class="internalDFN">target-URI</a>target-URI for a potentially dynamic resource instance</td>
-            <td>...</td>
+            <td><a href="#resource-represented-as-html" class="sectionRef"></a></td>
           </tr>
           <tr>
             <td>hasProvenance</td>
             <td>Indicates a <a class="internalDFN">provenance-URI</a> for a resource;  the resource identified by this property provides provenance information about its subject or anchor resource.
             </td>
-            <td>@@ref</td>
+            <td><a href="#resource-accessed-by-http" class="sectionRef"></a>, <a href="#resource-represented-as-html" class="sectionRef"></a></td>
           </tr>
           <tr>
             <td>hasProvenanceService</td>
             <td>Indicates a <a class="internalDFN">provenance service</a> that can provide provenance information about its sibject or anchowresource.</td>
-            <td>@@ref</td>
+            <td><a href="#specifying-provenance-services" class="sectionRef"></a></td>
           </tr>
           <tr>
             <td>provenanceUriTemplate</td>
             <td>Relates a provenance service to a URI template string for constructing provenance-URIs</td>
-            <td>@@ref</td>
+            <td><a href="#provenance-service-description" class="sectionRef"></a></td>
           </tr>
         </table>
     </section>