Merge pull request #291 from w3c/dcat-nits-simon

Remove minor nits left behind in copy-and-paste

dcat/index.html

@@ -72,11 +72,10 @@ <h2 >Namespaces</h2>
 
 <p>A data catalog conforms to DCAT if:</p>
 <ul>
-	<li> Access to data is organized into datasets, distributions, and data-distribution-services. </li>
-	<li> Access to other resources is organized into suitable sub-classes of catalogued-item. </li>
-	<li> An RDF description of the catalog itself and its datasets, distributions, and data-distribution-services is available (but the choice of
+	<li> Access to data is organized into datasets, distributions, and data-services. </li>
+	<li> An RDF description of the catalog itself and its datasets, distributions, and data-services is available (but the choice of
 RDF syntaxes, access protocols, and access policies is not mandated by this specification).</li>
-	<li> The contents of all metadata fields that are held in the catalog, and that contain data about the catalog itself and its datasets, distributions, and data-distribution-services, are included in this RDF description, expressed using the appropriate classes and properties from DCAT, except where no such class or property exists.</li>
+	<li> The contents of all metadata fields that are held in the catalog, and that contain data about the catalog itself and its datasets, distributions, and data-services, are included in this RDF description, expressed using the appropriate classes and properties from DCAT, except where no such class or property exists.</li>
 	<li> All classes and properties defined in DCAT are used in a way consistent with the semantics declared in this specification.</li>
 	<li>DCAT-compliant catalogs <em title="MAY" class="rfc2119">MAY</em> include additional non-DCAT metadata fields and additional RDF data in the catalog's RDF description.</li>
 </ul>
@@ -100,16 +99,16 @@ <h2>Vocabulary Overview</h2>
 
 <p class="note">From DCAT 2014 [[VOCAB-DCAT-20140116]] except as noted</p>
 
-<p>DCAT is an RDF vocabulary well-suited to representing data catalogs such as <a href="https://www.data.gov/">data.gov</a> and <a href="http://data.gov.uk">data.gov.uk</a>. DCAT defines seven (nine) main classes:</p>
+<p>DCAT is an RDF vocabulary well-suited to representing data catalogs such as <a href="https://www.data.gov/">data.gov</a> and <a href="http://data.gov.uk">data.gov.uk</a>. DCAT defines eight main classes:</p>
 <ul>
 	<li> <code><a href="#Class:_Catalog">dcat:Catalog</a></code> represents the catalog</li>
 	<li> <code><a href="#Class:_Resource">dcat:Resource</a></code> represents an item in a catalog.</li>
 	<li> <code><a href="#Class:_Dataset">dcat:Dataset</a></code> represents a dataset in a catalog.</li>
 	<li> <code><a href="#Class:_Distribution">dcat:Distribution</a></code> represents an accessible form or representation of a dataset as for example a downloadable file.</li>
 	<li> <code><a href="#Class:_Service">dcat:DataService</a></code> represents a data service in a catalog.</li>
 	<li> <code><a href="#Class:_DataDistributionService">dcat:DataDistributionService</a></code> represents a service that provides access to distributions of datasets and extracts of datasets.</li>
-	<li> (<code><a href="#Class:_DataTransformationService">dcat:DataTransformationService</a></code> represents a service that can transform a dataset, e.g. spatial coordinate transformation; interpolation or resampling of a dataset).</li>
-	<li> (<code><a href="#Class:_DiscoveryService">dcat:DiscoveryService</a></code> represents a service that supports discovery functions.)</li>
+<!--	<li> (<code><a href="#Class:_DataTransformationService">dcat:DataTransformationService</a></code> represents a service that can transform a dataset, e.g. spatial coordinate transformation; interpolation or resampling of a dataset).</li> -->
+	<li> <code><a href="#Class:_DiscoveryService">dcat:DiscoveryService</a></code> represents a service that supports discovery functions.</li>
 	<li> <code><a href="#Class:_CatalogRecord">dcat:CatalogRecord</a></code> describes a dataset entry in the catalog, primarily concerning the registration information such as who added the item and when</li>
 </ul>
 <p>
@@ -119,7 +118,7 @@ <h2>Vocabulary Overview</h2>
 Detailed properties for a data distribution service API are out of the scope of this version of DCAT. </p>
 
 <p>Datasets and <b>data services</b>, and potentially other types of thing, may be included in a <b>catalog</b>.
-Types of data service that might be found in a catalog include data distribution services, <b>discovery services</b> such as portals and catalog services, <b>data transformation services</b> such as coordinate transformation services, re-sampling and interpolation services, and various <b>data-processing services</b>.
+Types of data service that might be found in a catalog include data distribution services, <b>discovery services</b> such as portals and catalog services, <b>data transformation services</b> such as coordinate transformation services, re-sampling and interpolation services, and various <b>data processing services</b>.
 </p>
 
 <div class="note">
@@ -953,7 +952,7 @@ <h3>Class: Dataset</h3>
 </table>
 
 <p class="note">
-    In DCAT 2014 [[!VOCAB-DCAT]] <a href="#class-dataset">dcat:Dataset</a> was a sub-class of <a href="http://purl.org/dc/dcmitype/Dataset">dctype:Dataset</a>, which is a member of the <a href="http://dublincore.org/documents/dcmi-terms/#section-7">DCMI Types vocabulary</a> [[DCTERMS]].
+    In DCAT 2014 [[!VOCAB-DCAT-20140116]] <a href="#class-dataset">dcat:Dataset</a> was a sub-class of <a href="http://purl.org/dc/dcmitype/Dataset">dctype:Dataset</a>, which is a member of the <a href="http://dublincore.org/documents/dcmi-terms/#section-7">DCMI Types vocabulary</a> [[DCTERMS]].
 	This relationship has been removed in the revised DCAT vocabulary - see <a href="https://github.com/w3c/dxwg/issues/98">Issue #98</a>.
 </p>
 
@@ -1328,7 +1327,6 @@ <h3>Class: Catalogued resource</h3>
 <a href="#Property:resource_conformsto">conformsTo</a>,
 <a href="#Property:resource_contactPoint">contact point</a>,
 <a href="#Property:resource_description">description</a>,
-<a href="#Property:resource_distribution">distribution</a>,
 <a href="#Property:resource_identifier">identifier</a>,
 <a href="#Property:resource_keyword">keyword</a>,
 <a href="#Property:resource_landingpage">landing page</a>,
@@ -1346,19 +1344,19 @@ <h3>Class: Catalogued resource</h3>
 </p>
 
 <p class="issue" data-number="66">
-	The need to be able to link a catalogued item with the source of funding that supported its production has been identified as a requirement to be satisfied in the revision of DCAT.
+	The need to be able to link a catalogued resource with the source of funding that supported its production has been identified as a requirement to be satisfied in the revision of DCAT.
 </p>
 
 <p class="issue" data-number="71">
-	The need to be able to describe the business or project context related to production of a catalogued item has been identified as a requirement to be satisfied in the revision of DCAT.
+	The need to be able to describe the business or project context related to production of a catalogued resource has been identified as a requirement to be satisfied in the revision of DCAT.
 </p>
 
 <p class="issue" data-number="77">
-	The need to be able to link a catalogued item with the business or project context of its production has been identified as a requirement to be satisfied in the revision of DCAT.
+	The need to be able to link a catalogued resource with the business or project context of its production has been identified as a requirement to be satisfied in the revision of DCAT.
 </p>
 
 <p class="issue" data-number="81">
-	The need describe relationships between catalogued items has been identified as a requirement to be satisfied in the revision of DCAT.
+	The need describe relationships between catalogued resources has been identified as a requirement to be satisfied in the revision of DCAT.
 </p>
 
 <table class="definition">
@@ -1609,7 +1607,7 @@ <h4>Property: contact point</h4>
 <h4>Property: landing page</h4>
 
 <p class="note">
-	In DCAT 2014 [[!VOCAB-DCAT]] the domain of dcat:landingPage was dcat:Dataset,
+	In DCAT 2014 [[!VOCAB-DCAT-20140116]] the domain of dcat:landingPage was dcat:Dataset,
   which limited use of this property in other contexts. The domain has been relaxed in this revision -
   see <a href="https://github.com/w3c/dxwg/issues/122">Issue #122</a>.
 </p>

dcat/rdf/dcat.ttl

@@ -2,7 +2,7 @@
 # imports: http://purl.org/dc/dcmitype/
 # imports: http://purl.org/dc/terms/
 # imports: http://www.w3.org/2004/02/skos/core
-# imports: http://xmlns.com/foaf/spec/index.rdf
+# imports: http://xmlns.com/foaf/0.1/
 # prefix: dcat
 
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
@@ -125,7 +125,7 @@
   owl:imports dctype: ;
   owl:imports dct: ;
   owl:imports <http://www.w3.org/2004/02/skos/core> ;
-  owl:imports <http://xmlns.com/foaf/spec/index.rdf> ;
+  owl:imports <http://xmlns.com/foaf/0.1/> ;
   owl:versionInfo """Esta es una copia del vocabulario DCAT v1.0 disponible en https://www.w3.org/ns/dcat.ttl
 con modificaciones en progreso para la nueva versión de DCAT que resultará del grupo 'W3C Data Exchange Working Group'"""@en ;
   owl:versionInfo """This is a copy of v1.0 of the DCAT vocabulary, taken from https://www.w3.org/ns/dcat.ttl