Merge branch 'gh-pages' into dcat-issue725-riccardo

dcat/index.html

@@ -199,8 +199,8 @@ <h3>Non-normative namespaces</h3>
             RDF syntax, access protocol, and access policy are 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, the corresponding cataloged resources,  and distributions are included in this RDF description and are 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 MAY include additional non-DCAT metadata fields and additional RDF data in the catalog's RDF description.</li>
     </ul>
+    DCAT-compliant catalogs MAY include additional non-DCAT metadata fields and additional RDF data in the catalog's RDF description.
 
     <p>
         A <strong>DCAT profile</strong> is a specification for a data catalog that adds additional constraints to DCAT. A data catalog that conforms to the profile also conforms to DCAT. Additional constraints in a profile MAY include:
@@ -233,7 +233,7 @@ <h2>Vocabulary overview</h2>
     <h3>DCAT scope</h3>
 
     <p>DCAT is an RDF vocabulary for representing data catalogs.
-      DCAT is based around eight main classes:</p>
+      DCAT is based around six main classes <a href="#UML_DCAT_All_Attr"></a>:</p>
     <ul>
         <li>
           <a href="#Class:Catalog"><code>dcat:Catalog</code></a> represents a catalog, which is a dataset in which each individual item is a metadata record describing some resource; the scope of <code>dcat:Catalog</code> is collections of metadata about <b>datasets</b> or <b>data services</b>.
@@ -256,14 +256,6 @@ <h3>DCAT scope</h3>
           <a href="#Class:Data_Service"><code>dcat:DataService</code></a> represents a data service.
           A data service is a collection of operations accessible through an interface (<abbr title="Application Programming Interface">API</abbr>) that provide access to one or more datasets or data processing functions.
         </li>
-        <!--
-          <li>
-            <a href="#Class:DataTransformationService"><code>dcat:DataTransformationService</code></a> represents a service that can transform a dataset, e.g. spatial coordinate transformation; interpolation or resampling of a dataset.
-          </li>
-        <li>
-          <a href="#Class:Discovery_Service"><code>dcat:DiscoveryService</code></a> represents a description of a kind of data distribution service that provides access to one or more catalogs to support discovery functions.
-        </li>
-      -->
         <li>
           <a href="#Class:Catalog_Record"><code>dcat:CatalogRecord</code></a> represents a metadata item in the catalog, primarily concerning the registration information, such as who added the item and when.
         </li>
@@ -3699,9 +3691,9 @@ <h3>Degree of conformance</h3>
 iso:compliance a dqv:Dimension ;
   skos:prefLabel "Compliance"@en ;
   skos:definition "The degree to which data has attributes that adhere to standards, conventions or regulations in force and similar rules relating to data quality in a specific context of use."@en ;
-  dqv:inCategory iso:inherentandSystemDependentDataQuality .
+  dqv:inCategory iso:inherentAndSystemDependentDataQuality .
 
-iso:inherentandSystemDependentDataQuality a dqv:Category ;
+iso:inherentAndSystemDependentDataQuality a dqv:Category ;
   skos:prefLabel "Inherent and System-Dependent Data Quality"@en .</pre>
 </aside>
 
@@ -3821,7 +3813,7 @@ <h3>Conformance test results</h3>
         &lt;/exception&gt;
       &lt;/test-method&gt;"""^^rdf:XMLLiteral ;
     #it can be in any format suppored by dc
-    dc:format  "text/xml"
+    dc:format  "application/xml"
   ] ;
   oa:motivatedBy dqv:qualityAssessment, oa:assessing ;
   dqv:inDimension iso:compliance
@@ -3850,7 +3842,7 @@ <h3>Conformance test results</h3>
   .</pre>
 </aside>
 
-          <p>Of course,  the above modelling patterns can represent any quality tests not only conformance to standards.</p>
+          <p>Of course, the above modelling patterns can represent any quality tests, not only conformance to standards.</p>
         </section>
     </section>
 </section>