Merging
authorYves Raimond <yves.raimond@bbc.co.uk>
Mon, 17 Feb 2014 15:16:13 +0000
changeset 1937 d5415c49be4f
parent 1936 563e7a5be321 (current diff)
parent 1934 01ec0cc2751a (diff)
child 1938 a2a6defb18bb
child 1939 5cabfdeab429
Merging
--- a/REC-drafts/REC-rdf11-concepts-20140225/Overview.html	Mon Feb 17 15:16:02 2014 +0000
+++ b/REC-drafts/REC-rdf11-concepts-20140225/Overview.html	Mon Feb 17 15:16:13 2014 +0000
@@ -388,17 +388,17 @@
 
     <ul>
       <li>the <a href="http://www.w3.org/TR/rdf11-mt/">formal
-        model-theoretic semantics for RDF and RDFS</a> [<cite><a class="bibref" href="#bib-RDF11-MT">RDF11-MT</a></cite>]</li>
+        model-theoretic semantics for RDF</a> [<cite><a class="bibref" href="#bib-RDF11-MT">RDF11-MT</a></cite>];</li>
 
       <li>serialization syntaxes for storing and exchanging RDF such as
         <a href="http://www.w3.org/TR/turtle/">Turtle</a> [<cite><a class="bibref" href="#bib-TURTLE">TURTLE</a></cite>]
-        and <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a> [<cite><a class="bibref" href="#bib-JSON-LD">JSON-LD</a></cite>]</li>
+        and <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a> [<cite><a class="bibref" href="#bib-JSON-LD">JSON-LD</a></cite>];</li>
 
       <li>the <a href="http://www.w3.org/TR/rdf-sparql-query/">SPARQL
-        Query Language</a> [<cite><a class="bibref" href="#bib-SPARQL11-OVERVIEW">SPARQL11-OVERVIEW</a></cite>]</li>
+        Query Language</a> [<cite><a class="bibref" href="#bib-SPARQL11-OVERVIEW">SPARQL11-OVERVIEW</a></cite>];</li>
 
-      <li>the <a href="http://www.w3.org/TR/rdf-schema/">RDF Vocabulary
-        Description Language</a> (RDFS) [<cite><a class="bibref" href="#bib-RDF11-SCHEMA">RDF11-SCHEMA</a></cite>]</li>
+      <li>the <a href="http://www.w3.org/TR/rdf-schema/">RDF Schema vocabulary</a>
+	[<cite><a class="bibref" href="#bib-RDF11-SCHEMA">RDF11-SCHEMA</a></cite>].</li>
     </ul>
 
 <section id="data-model" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
--- a/rdf-concepts/index.html	Mon Feb 17 15:16:02 2014 +0000
+++ b/rdf-concepts/index.html	Mon Feb 17 15:16:13 2014 +0000
@@ -152,17 +152,17 @@
 
     <ul>
       <li>the <a href="http://www.w3.org/TR/rdf11-mt/">formal
-        model-theoretic semantics for RDF and RDFS</a> [[RDF11-MT]]</li>
+        model-theoretic semantics for RDF</a> [[RDF11-MT]];</li>
 
       <li>serialization syntaxes for storing and exchanging RDF such as
         <a href="http://www.w3.org/TR/turtle/">Turtle</a> [[TURTLE]]
-        and <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a> [[JSON-LD]]</li>
+        and <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a> [[JSON-LD]];</li>
 
       <li>the <a href="http://www.w3.org/TR/rdf-sparql-query/">SPARQL
-        Query Language</a> [[SPARQL11-OVERVIEW]]</li>
+        Query Language</a> [[SPARQL11-OVERVIEW]];</li>
 
-      <li>the <a href="http://www.w3.org/TR/rdf-schema/">RDF Vocabulary
-        Description Language</a> (RDFS) [[RDF11-SCHEMA]]</li>
+      <li>the <a href="http://www.w3.org/TR/rdf-schema/">RDF Schema vocabulary</a>
+	[[RDF11-SCHEMA]].</li>
     </ul>
 
 <section id="data-model">
--- a/rdf-dataset/index.html	Mon Feb 17 15:16:02 2014 +0000
+++ b/rdf-dataset/index.html	Mon Feb 17 15:16:13 2014 +0000
@@ -11,7 +11,8 @@
           localBiblio: localBibliography,
 
           // specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
-          specStatus:           "FPWD",
+          specStatus:           "WG-NOTE",
+          errata:               "http://www.w3.org/2014/rdf1.1-errata",
 
          // the specification's short name, as in http://www.w3.org/TR/short-name/
           shortName:            "rdf11-datasets",
@@ -21,7 +22,7 @@
           // subtitle   :  "an excellent document",
 
           // if you wish the publication date to be other than today, set this
-          publishDate:  "2013-12-17",
+          publishDate:  "2014-02-25",
 
           // if the specification's copyright date is a range of years, specify
           // the start date here:
@@ -29,12 +30,12 @@
 
           // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
           // and its maturity status
-//          previousPublishDate:  "2004-02-10",
-//          previousMaturity:  "REC",
+          previousPublishDate:  "2013-12-17",
+          previousMaturity:  "WD",
 
           // if there a publicly available Editor's Draft, this is the link
 //
-          edDraftURI:           "https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-dataset/index.html",
+          // edDraftURI:           "https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-dataset/index.html",
 
           // if this is a LCWD, uncomment and set the end of its review period
           // lcEnd: "2009-08-05",
@@ -117,7 +118,9 @@
 </section>
 
 <section id="sotd">
-  <p>The RDF Working Group expects this document to become a Working Group Note.</p>
+  <p>The document is part of the RDF 1.1 document suite. The RDF
+  Working Group did not standardize the semantics of RDF
+  datasets. This note discusses issues in specifying such semantics. </p>
 </section>
 
 <section id="sec-introduction">
--- a/rdf-new/index.html	Mon Feb 17 15:16:02 2014 +0000
+++ b/rdf-new/index.html	Mon Feb 17 15:16:13 2014 +0000
@@ -12,7 +12,9 @@
 
           // specification status (e.g. WD, LC, WG-NOTE, etc.). If in doubt use ED.
           specStatus:           "WG-NOTE",
-          noRecTrack:           true,
+          errata:               "http://www.w3.org/2014/rdf1.1-errata",
+          noRecTrack:            true,
+          errata:               "http://www.w3.org/2014/rdf1.1-errata",
 
           // the specification's short name, as in http://www.w3.org/TR/short-name/
           shortName:            "rdf11-new",