Merge pull request #1214 from w3c/rec-2020-tweaks

Upstreaming tweaks applied to the REC

dcat/config.js

@@ -10,22 +10,28 @@ var respecConfig = {
     shortName: "vocab-dcat-2",
     prevRecShortname: "vocab-dcat",
     canonicalURI: "TR",
-    prevRecURI:           "https://www.w3.org/TR/2014/REC-vocab-dcat-20140116/",    
-    previousPublishDate:  "2019-10-03",
-    previousMaturity:     "CR",
+    prevRecURI:           "https://www.w3.org/TR/2014/REC-vocab-dcat-20140116/",
+    previousPublishDate:  "2019-11-19",
+    previousMaturity:     "PR",
 //    previousURI:          "https://www.w3.org/TR/2019/WD-vocab-dcat-2-20190528/",
     edDraftURI:           "https://w3c.github.io/dxwg/dcat/",
 //    issueBase:            "https://github.com/w3c/dxwg/issues/", -- Not needed when github used
     alternateFormats: [{
       label: "Turtle",
-      uri: "https://w3c.github.io/dxwg/dcat/rdf/dcat.ttl",
-    }], 
+      uri: "https://www.w3.org/ns/dcat.ttl",
+    },{
+      label: "RDF/XML",
+      uri: "https://www.w3.org/ns/dcat.rdf",
+    },{
+      label: "JSON-LD",
+      uri: "https://www.w3.org/ns/dcat.jsonld",
+    }],
     editors: [{
       name:       "Riccardo Albertoni",
       orcid:  "0000-0001-5648-2713",
       company:    "CNR - Consiglio Nazionale delle Ricerche, Italy",
       url: "http://www.imati.cnr.it/joomla/index.php/people/8-curricula/178-riccardo-albertoni",
-      companyURL: "http://www.cnr.it/",
+      companyURL: "https://www.cnr.it/",
       w3cid: 72458
     },{
       name: "David Browning",
@@ -56,7 +62,7 @@ var respecConfig = {
     },{
       name: "Peter Winstanley",
       company: "Scottish Government",
-      companyURL: "http://www.gov.scot/",
+      companyURL: "https://www.gov.scot/",
       w3cid: 64374
     }],
     formerEditors: [{
@@ -133,7 +139,7 @@ var respecConfig = {
             href: "https://dcat-ap.de/def/"
         },
         "DDI" : {
-            href : "http://www.ddialliance.org/explore-documentation",
+            href : "https://www.ddialliance.org/explore-documentation",
             title : "Data Documentation Initiative",
             publisher : "DDI Alliance"
         },
@@ -269,7 +275,7 @@ var respecConfig = {
             status: "IETF Internet Draft"
         },
         "SCHEMA-ORG" : {
-            href : "http://schema.org/",
+            href : "https://schema.org/",
             title : "Schema.org"
         },
         "ShEx" : {
@@ -280,7 +286,7 @@ var respecConfig = {
 			publisher: "Shape Expressions W3C Community Group"
         },
         "VIVO-ISF" : {
-            href:"http://github.com/vivo-isf/vivo-isf",
+            href:"https://github.com/vivo-isf/vivo-isf",
             title:"VIVO-ISF Data Standard"
         },
         "ZaveriEtAl" : {

dcat/index.html

@@ -675,8 +675,8 @@ <h3>RDF representation</h3>
             The axiomatization of DCAT 2014 used global domain and range constraints for many of the properties defined in the DCAT namespace [[?VOCAB-DCAT-20140116]]. This makes quite strong ontological commitments, some of which are now being reconsidered - see individual issues noted inline below.
         </p-->
 
-        <p>The (revised) DCAT vocabulary is <a href="https://github.com/w3c/dxwg/tree/gh-pages/dcat/rdf/">available in RDF</a>.
-            The primary artefact <a href="https://w3c.github.io/dxwg/dcat/rdf/dcat2.ttl"><code>dcat2.ttl</code></a> is a serialization of the core DCAT vocabulary.
+        <p>The (revised) DCAT vocabulary is <a href="https://www.w3.org/ns/dcat#">available in RDF</a>.
+            The primary artefact <a href="https://www.w3.org/ns/dcat2.ttl"><code>dcat2.ttl</code></a> is a serialization of the core DCAT vocabulary.
             Alongside it are a set of other RDF files that provide additional information, including:</p>
         <ol>
             <li>
@@ -686,7 +686,7 @@ <h3>RDF representation</h3>
                 additional axioms, which can be useful in some contexts
             </li>
             <li>
-                the files dcat2014.ttl and dcat2014.rdf that correspond to the 2014 version of DCAT [[?VOCAB-DCAT-20140116]]
+                the files <a href="https://www.w3.org/ns/dcat2014.ttl">dcat2014.ttl</a> and <a href="https://www.w3.org/ns/dcat2014.rdf">dcat2014.rdf</a> that correspond to the 2014 version of DCAT [[?VOCAB-DCAT-20140116]]
             </li>
         </ol>
 

errata/index.html

@@ -63,7 +63,7 @@ <h1 class="done">Open Errata on the “Data Catalog Vocabulary (DCAT) - Version
             <dt>Editor’s draft:</dt>
             <dd><a class="done" href="https://w3c.github.io/dxwg/dcat/">https://w3c.github.io/dxwg/dcat</a></dd>
             <dt>Latest Publication Date:</dt>
-            <dd class="todo">@@@@ @@@@, @@@@</dd>
+            <dd>4 February, 2020</dd>
         </dl>
         <section>
           <h2>Substantial Issues</h2>
@@ -108,7 +108,7 @@ <h2>Editorial Issues</h2>
 
     <footer>
       <address class="done"><a href="mailto:[email protected]" class=''>Dave Raggett</a>, &lt;[email protected]&gt;, (W3C)</address>
-      <p class="copyright"><a href="/Consortium/Legal/ipr-notice#Copyright" rel="Copyright">Copyright</a> © <span class="todo">2020</span> <a href="/"><acronym title="World Wide Web Consortium">W3C</acronym></a> <sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>), All Rights Reserved.</p>
+      <p class="copyright"><a href="/Consortium/Legal/ipr-notice#Copyright" rel="Copyright">Copyright</a> © <span>2020</span> <a href="https://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a> <sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>), All Rights Reserved.</p>
     </footer>
   </body>
 </html>