Improve usage/scope notes

drop DiscoveryService class

dcat/index.html

@@ -168,10 +168,10 @@ <h3>DCAT scope</h3>
           <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:Discovery_Service">dcat:DiscoveryService</a></code> represents a description of a kind of data distribution service that provides access to one or more catalogs to support discovery functions.
         </li>
+      -->
         <li>
           <code><a href="#Class:Catalog_Record">dcat:CatalogRecord</a></code> represents a metadata item in the catalog, primarily concerning the registration information, such as who added the item and when.
         </li>
@@ -203,7 +203,7 @@ <h3>DCAT scope</h3>
       A data service typically provides selection, extraction, combination, processing or transformation operations over datasets that might be hosted locally or remote to the service.
       The result of a request to a data service is a representation of a dataset or catalog.
       A <b>data distribution service</b> is a kind of data service that provides the means to select and download a distribution of a dataset or subset.
-      A <b>discovery service</b> is a kind of data distribution service that provides the means to find the description of a suitable dataset, often through a portal or catalog service.
+      A data discovery service is a kind of data service that provides the means to find the description of a suitable dataset, often through a portal or catalog service.
       Other kinds of data service might include data transformation services such as coordinate transformation services, re-sampling and interpolation services, and various data processing services.
       These are outside the scope of the current DCAT vocabulary.
       A data service might be tied to specific datasets, or its source data might be configured at request- or run-time.
@@ -1412,8 +1412,8 @@ <h3>Class: Dataset</h3>
         <p class="note">
             <a href="https://www.w3.org/TR/dcat-ucr/#RDSC">Dataset citation</a> is one of the requirements identified for the DCAT revision.
             Data citation is the practice of referencing data in a similar way as when providing bibliographic references, acknowledging data
-            as a first class output in any investigative process. Data citation offers multiple benefits, such as crediting those producing the data,
-            facilitating data discovery, supporting tracking the impact and reuse of data.
+            as a first class output in any investigative process.
+            Data citation offers multiple benefits, such as crediting those producing the data, facilitating data discovery, supporting tracking the impact and reuse of data.
 
             To support data citation, the dataset description should include at a minimum: the dataset identifier, the dataset creator (added in this DCAT revision
             as part of the properties recommended for Dataset), the dataset title, the dataset publisher and the dataset release date.
@@ -1879,7 +1879,8 @@ <h3>Class: Data Service</h3>
             <tr><td class="prop">Definition:</td><td>A site or end-point providing operations related to the discovery of, access to, or processing functions on, data or related resources</td></tr>
             <tr><td class="prop">Sub class of:</td><td><a href="http://www.w3.org/ns/dcat#Resource">dcat:Resource</a></td></tr>
             <tr><td class="prop">Sub class of:</td><td><a href="http://purl.org/dc/dcmitype/Service">dctype:Service</a></td></tr>
-            <tr><td class="prop">Usage note:</td><td><code><a href="#Class:DataService">dcat:DataService</a></code> is an extension point for the description of any kind of data service. Currently only one subclass is defined - DataDistributionService - but additional subclasses may be defined in a DCAT application profile or other DCAT application for catalogs of other kinds of services</td></tr>
+            <tr><td class="prop">Usage note:</td><td><code>The class <a href="#Class:DataService">dcat:DataService</a></code> is an extension point for the description of any kind of data service. Currently only one subclass is defined - DataDistributionService - but additional subclasses may be defined in a DCAT application profile or other DCAT application for catalogs of other kinds of services</td></tr>
+            <tr><td class="prop">Usage note:</td><td><code>The kind of service can be indicated using the <a href="http://purl.org/dc/terms/type">dct:type</a> property. Its value may be taken from a controlled vocabulary such as the <a href="https://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/">INSPIRE spatial data service type vocabulary</a></td></tr>
             </tbody>
         </table>
 
@@ -1974,7 +1975,8 @@ <h3>Class: Data Distribution Service</h3>
             <tbody>
             <tr><td class="prop">Definition:</td><td>A site or end-point that provides access to distributions of datasets</td></tr>
             <tr><td class="prop">Sub class of:</td><td><a href="http://www.w3.org/ns/dcat#DataService">dcat:DataService</a></td></tr>
-            <tr><td class="prop">Usage note:</td><td>A <i>Data Discovery Service</i> is a DataDistributionService that supports discovery of data, usually by providing access to a Catalog. In that context least one <a href="http://www.w3.org/ns/dcat#Catalog">dcat:Catalog</a> would appear as the object of its <a href="http://www.w3.org/ns/dcat#servesDataset">dcat:servesDataset</a> property</td></tr>
+            <tr><td class="prop">Usage note:</td><td><code>A DataDistributionService is usually bound to one or more specified Datasets, as indicated by the <a href="http://www.w3.org/ns/dcat#servesDataset">dcat:servesDataset</a> property.</td></tr>
+            <tr><td class="prop">Usage note:</td><td>A <i>Data Discovery Service</i> supports discovery of data, usually by providing access to a Catalog. In that context the Data Discovery Service can be understood as a DataDistributionService in which least one <a href="http://www.w3.org/ns/dcat#Catalog">dcat:Catalog</a> appears as the object of its <a href="http://www.w3.org/ns/dcat#servesDataset">dcat:servesDataset</a> property</td></tr>
             </tbody>
         </table>
 
@@ -1991,13 +1993,10 @@ <h4>Property: serves dataset</h4>
 
     </section> <!-- end class DataDistributionService -->
 
-
+<!--
     <section id="Class:Discovery_Service">
         <h3>Class: Discovery Service</h3>
 
-        <p class="issue" data-number="432">
-          Dropping this named class is under consideration.
-        </p>
         <p>The following properties are inherited from the super-class <a href="http://www.w3.org/ns/dcat#DataService">dcat:DataService</a>:
             <a href="#Property:dataservice_endpointdescription">endpointDescription</a>,
             <a href="#Property:dataservice_endpointurl">endpointURL</a>,
@@ -2038,7 +2037,7 @@ <h3>Class: Discovery Service</h3>
         </p>
 
     </section> <!-- end class DiscoveryService -->
-
+-->
 
 
     <section id="Class:Concept_Scheme">

dcat/rdf/dcat.ttl

@@ -242,7 +242,8 @@ dcat:DataDistributionService
   rdfs:subClassOf dcat:DataService ;
   skos:changeNote "New class in this revision of DCAT" ;
   skos:editorialNote "Status: Class accepted by DCAT revision team, but details of definition and constraints not yet resolved." ;
-  skos:scopeNote "A Data Discovery Service is a DataDistributionService that supports discovery of data, usually by providing access to a Catalog. In that context least one dcat:Catalog would appear as the object of its dcat:servesDataset property" ;
+  skos:scopeNote "A DataDistributionService is usually bound to one or more specified Datasets, as indicated by the dcat:servesDataset property" ;
+  skos:scopeNote "A Data Discovery Service is a DataDistributionService that supports discovery of data, usually by providing access to a Catalog. In that context the Data Discovery Service can be understood as a DataDistributionService in which least one dcat:Catalog appears as the object of its dcat:servesDataset property" ;
 .
 dcat:DataService
   rdf:type owl:Class ;
@@ -257,7 +258,8 @@ dcat:DataService
     ] ;
   skos:changeNote "New class in this revision of DCAT" ;
   skos:editorialNote "Status: Class accepted by DCAT revision team, but details of definition and constraints not yet resolved." ;
-  skos:scopeNote "dcat:DataService is an extension point for the description of any kind of data service. Currently only one subclass is defined - DataDistributionService - but additional subclasses may be defined in a DCAT application profile or other DCAT application for catalogs of other kinds of services" ;
+  skos:scopeNote "The class dcat:DataService is an extension point for the description of any kind of data service. Currently only one subclass is defined - DataDistributionService - but additional subclasses may be defined in a DCAT application profile or other DCAT application for catalogs of other kinds of services" ;
+  skos:scopeNote "The kind of service can be indicated using the dct:type property. Its value may be taken from a controlled vocabulary such as the INSPIRE spatial data service type vocabulary" ;
 .
 dcat:Dataset
   rdf:type rdfs:Class ;