Merge
authorGavin Carothers <gavin@carothers.name>
Wed, 03 Jul 2013 07:21:16 -0700
changeset 893 5e9051cca032
parent 892 872eddcf501a (current diff)
parent 891 6da1ae2f1dce (diff)
child 894 5a21768d3f77
Merge
--- a/ReSpec.js/bibref/biblio.js	Wed Jul 03 07:21:01 2013 -0700
+++ b/ReSpec.js/bibref/biblio.js	Wed Jul 03 07:21:16 2013 -0700
@@ -10,11 +10,12 @@
     "TRIG" : "Gavin Carothers. <a href=\"http://www.w3.org/TR/trig/\"><cite>TriG</cite></a>. W3C Working Draft (work in progress). URL: <a href=\"http://www.w3.org/TR/trig/\">http://www.w3.org/TR/trig/</a>",
     "N-TRIPLES" : "Gavin Carothers. <a href=\"http://www.w3.org/TR/n-triples/\"><cite>N-Triples</cite></a>. W3C Working Draft (work in progress). URL: <a href=\"http://www.w3.org/TR/n-triples/\">http://www.w3.org/TR/n-triples/</a>",
     "N-QUADS" : "Gavin Carothers. <a href=\"http://www.w3.org/TR/n-quads/\"><cite>N-Quads</cite></a>. W3C Working Draft (work in progress). URL: <a href=\"http://www.w3.org/TR/n-quads/\">http://www.w3.org/TR/n-quads/</a>",
-    "JSON-LD" : "Manu Sporny; Dave Longley; Gregg Kellogg; Markus Lanthaler; Mark Birbeck. <a href=\"http://www.w3.org/TR/2012/WD-json-ld-syntax-20120712/\"><cite>JSON-LD Syntax 1.0: A Context-based JSON Serialization for Linking Data</cite></a> 12 July 2012. W3C Working Draft (work in progress). URL: <a href=\"http://www.w3.org/TR/2012/WD-json-ld-syntax-20120712/\">http://www.w3.org/TR/2012/WD-json-ld-syntax-20120712/</a>",
+    "JSON-LD" : "Manu Sporny; Dave Longley; Gregg Kellogg; Markus Lanthaler; Mark Birbeck. <a href=\"http://www.w3.org/TR/json-ld-syntax/\"><cite>JSON-LD Syntax 1.0: A Context-based JSON Serialization for Linking Data</cite></a> 11 April 2013. W3C Last Call Working Draft (work in progress). URL: <a href=\"http://www.w3.org/TR/json-ld-syntax/\">http://www.w3.org/TR/json-ld-syntax/</a>",
     "JSON-LD-API" : "Manu Sporny; Gregg Kellogg; Dave Longley; Markus Lanthaler; Mark Birbeck. <a href=\"http://www.w3.org/TR/2012/WD-json-ld-api-20120712/\"><cite>JSON-LD Api 1.0: An Application Programming Interface for the JSON-LD Syntax</cite></a> 12 July 2012. W3C Working Draft (work in progress). URL: <a href=\"http://www.w3.org/TR/2012/WD-json-ld-api-20120712/\">http://www.w3.org/TR/2012/WD-json-ld-api-20120712/</a>",
 
 // For RDF Concepts
 
+   "LINKED-DATA" : "Tim Berners-Lee. <a href=\"http://www.w3.org/DesignIssues/LinkedData.html\"><cite>Linked Data</cite></a> 19 June 2009. W3C Design Issue. URL: <a href=\"http://www.w3.org/DesignIssues/LinkedData.html\">http://www.w3.org/DesignIssues/LinkedData.html</a>",
    "RDF-MIME-TYPE" : "<a href=\"http://www.iana.org/assignments/media-types/\"><cite>MIME Media Types</cite></a>, The Internet Assigned Numbers Authority (IANA). This document is http://www.iana.org/assignments/media-types/ .  The <a href=\"http://www.w3.org/2001/sw/RDFCore/mediatype-registration\">registration for <code>application/rdf+xml</code></a> is archived at http://www.w3.org/2001/sw/RDFCore/mediatype-registration .",
    "RDF-PLAINLITERAL" : "Jie Bao; Sandro Hawke; Boris Motik; Peter F. Patel-Schneider; Axel Polleres. <a href=\"http://www.w3.org/TR/2009/REC-rdf-plain-literal-20091027/\"><cite>rdf:PlainLiteral: A Datatype for RDF Plain Literals.</cite></a> 27 October 2009. W3C Recommendation. URL: <a href=\"http://www.w3.org/TR/2009/REC-rdf-plain-literal-20091027/\">http://www.w3.org/TR/2009/REC-rdf-plain-literal-20091027/</a>",
    "WELL-KNOWN" : "M. Nottingham; E. Hammer-Lahav. <a href=\"http://tools.ietf.org/html/rfc5785\"><cite>Defining Well-Known Uniform Resource Identifiers (URIs).</cite></a> April 2010. Internet RFC 5785. URL: <a href=\"http://tools.ietf.org/html/rfc5785\">http://tools.ietf.org/html/rfc5785</a>",
--- a/rdf-concepts/index.html	Wed Jul 03 07:21:01 2013 -0700
+++ b/rdf-concepts/index.html	Wed Jul 03 07:21:16 2013 -0700
@@ -187,7 +187,8 @@
     <h3>Resources and Statements</h3>
 
     <p>Any <a>IRI</a> or <a>literal</a> <dfn title="denote">denotes</dfn>
-    some thing in the universe of discourse. These things are called
+    some thing in the real or virtual worlds (the "universe of discourse").
+    These things are called
     <dfn title="resource">resources</dfn>. Anything can be a resource,
     including physical things, documents, abstract concepts, numbers
     and strings; the term is synonymous with “entity”.
@@ -268,13 +269,16 @@
     <a title="RDF statement">RDF statements</a>.</li>
     </ul>
 
-    <p>Perhaps the most important characterisitic of <a title="IRI">IRIs</a>
+    <p>Perhaps the most important characteristic of <a title="IRI">IRIs</a>
     in web architecture is that they can be 
     <a href="http://www.w3.org/TR/webarch/#uri-dereference">dereferenced</a>,
     and hence serve as starting points for interactions with a remote server.
-    This specification, however, is not concerned with such interactions.
+    This specification is not concerned with such interactions.
     It does not define an interaction model. It only treats IRIs as globally
-    unique identifiers in a graph data model that describes resources.</p>
+    unique identifiers in a graph data model that describes resources.
+		However, those interactions are critical to the concept of
+		<em><a href="http://www.w3.org/DesignIssues/LinkedData.html">Linked Data</a></em> [[LINKED-DATA]],
+		which makes use of the RDF data model and serialization formats.</p>
 </section>
 
 <section id="vocabularies">
@@ -287,7 +291,7 @@
     RDF vocabularies. Some such vocabularies are mentioned in the
     Primer [[RDF-PRIMER]].</p>
 
-    <p>The <a title="IRI">IRIs</a> in an <a>RDF vocabulary</a> often share
+    <p>The <a title="IRI">IRIs</a> in an <a>RDF vocabulary</a> often begin with
     a common substring known as a <dfn>namespace IRI</dfn>.
     Some namespace IRIs are associated by convention with a short name
     known as a <dfn>namespace prefix</dfn>. Some examples:
@@ -299,9 +303,9 @@
       <tr><td>xsd</td><td><a href="http://www.w3.org/2001/XMLSchema#"><code>http://www.w3.org/2001/XMLSchema#</code></a></td><td>The <a>RDF-compatible XSD types</a></td></tr>
     </table>
 
-    <p>In some contexts it is common to abbreviate <a title="IRI">IRIs</a>
+    <p>In some serialization formats it is common to abbreviate <a title="IRI">IRIs</a>
     that start with <a title="namespace IRI">namespace IRIs</a> by using the
-    associated <a>namespace prefix</a>. For example, the IRI
+    associated <a>namespace prefix</a> in order to assist readability. For example, the IRI
     <code>http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral</code>
     would be abbreviated as <code>rdf:XMLLiteral</code>.
     Note however that these abbreviations are <em>not</em> valid IRIs,
@@ -448,7 +452,7 @@
 
     <p>An <dfn>RDF document</dfn> is a document that encodes an
     <a>RDF graph</a> or <a>RDF dataset</a> in a <dfn>concrete RDF syntax</dfn>,
-    such as Turtle [[TURTLE-TR]], RDFa [[RDFA-PRIMER]],
+    such as Turtle [[TURTLE-TR]], RDFa [[RDFA-PRIMER]], JSON-LD [[JSON-LD]],
     RDF/XML [[RDF-SYNTAX-GRAMMAR]], or N-Triples [[N-TRIPLES]].  
     RDF documents enable the exchange of RDF graphs and RDF datasets
     between systems.</p>
@@ -657,6 +661,30 @@
 		
 		<p>denote the same value, but are not the same literal
 		<a title="RDF Term">RDF terms</a> and are not term-equals.</p>
+		
+		<p>The <dfn>literal value</dfn> associated with a <a>literal</a> is:</p>
+
+    <ol>
+    <li><strong>If the literal is a <a>language-tagged string</a>,</strong>
+    then the literal value is a pair consisting of its <a>lexical form</a>
+    and its <a>language tag</a>, in that order.</li>
+    <li><strong>If the literal's <a>datatype IRI</a> is not
+		<a title="recognized datatype IRIs">recognized</a> by an
+		implementation,</strong> then the literal value
+    is not defined by this specification.</li>
+    <li>Let <var>d</var> be the <a>referent</a> of the
+    datatype IRI in the set of <a>recognized datatype IRIs</a>.
+    <strong>If the literal's <a>lexical form</a> is in the
+    <a>lexical space</a> of <var>d</var>,</strong> then the literal value
+    is the result of applying the <a>lexical-to-value mapping</a>
+    of <var>d</var> to the <a>lexical form</a>.</li>
+		<li><strong>Otherwise</strong>, the <dfn>literal</dfn> is ill-typed,
+		and no literal value can be associated with the literal. Such a case
+		produces a semantic inconsistency but is not <em>syntactically</em>
+		ill-formed and implementations MUST accept ill-typed literals and produce
+		RDF graphs from them.  Implementations MAY produce warnings when
+		encountering ill-typed literals.</li>
+    </ol>
 			
 </section>
 
@@ -730,13 +758,13 @@
 
 
 <section id="graph-isomorphism">
-    <h3>Graph Isomorphism</h3>
+    <h3>Graph Comparison</h3>
 
     <p id="section-graph-equality">Two
     <a title="RDF graph">RDF graphs</a> <var>G</var> and <var>G'</var> are
-    <dfn title="graph isomorphism">isomorphic</dfn> if there
-    is a bijection <var>M</var> between the sets of nodes of the two graphs,
-    such that:</p>
+    <dfn title="graph isomorphism">isomorphic</dfn> (that is, they have an identical
+		form) if there is a bijection <var>M</var> between the sets of nodes of the two
+		graphs, such that:</p>
 
     <ol>
       <li><var>M</var> maps blank nodes to blank nodes.</li>
@@ -802,13 +830,13 @@
     </div>
 
 <section id="section-dataset-isomorphism">
-		<h3>RDF Dataset Isomorphism</h3>
+		<h3>RDF Dataset Comparison</h3>
 
     <p id="section-graph-equality">Two <a title="RDF Dataset">RDF datasets</a>
     (the RDF dataset <var>D1</var> with default graph <var>DG1</var> and named
 		graph <var>NG1</var> and the RDF dataset <var>D2</var> with default graph
-		<var>DG2</var> and named graph <var>NG2<var>) are dataset-isomorphic if
-		and only if:</p>
+		<var>DG2</var> and named graph <var>NG2<var>) are
+		<dfn title="dataset isomorphism">dataset-isomorphic</dfn> if and only if:</p>
 		<ol>
 		  <li><var>DG1</var> and <var>DG2</var> are graph-isomorphic;</li>
 		  <li>For each <var>(n1,g1)</var> in <var>NG1</var>, there exists 
@@ -1198,37 +1226,6 @@
     are not required to support either of these facilities.</p>
 </section>
 
-
-<section id="section-Literal-Value">
-    <h3>The Value Corresponding to a Literal</h3>
-
-    <p>The <dfn>literal value</dfn> associated with a <a>literal</a> is:</p>
-
-    <ol>
-    <li><strong>If the literal is a <a>language-tagged string</a>,</strong>
-    then the literal value is a pair consisting of its <a>lexical form</a>
-    and its <a>language tag</a>, in that order.</li>
-    <li><strong>If the literal's <a>datatype IRI</a> is not
-		<a title="recognized datatype IRIs">recognized</a> by an
-		implementation,</strong> then the literal value
-    is not defined by this specification.</li>
-    <li>Let <var>d</var> be the <a>referent</a> of the
-    datatype IRI in the set of <a>recognized datatype IRIs</a>.</li> 
-    <li><strong>If the literal's <a>lexical form</a> is in the
-    <a>lexical space</a> of <var>d</var>,</strong> then the literal value
-    is the result of applying the <a>lexical-to-value mapping</a>
-    of <var>d</var> to the <a>lexical form</a>.</li>
-		<li><strong>Otherwise</strong>, the <dfn>literal</dfn> is ill-typed,
-		and no literal value can be associated with the literal. Such a case
-		produces a semantic inconsistency but is not <em>syntactically</em>
-		ill-formed and implementations MUST accept ill-typed literals and produce
-		RDF graphs from them.  Implementations MAY produce warnings when
-		encountering ill-typed literals.</li>
-    </ol>
-
-</section>
-
-
 </section>
 
 
@@ -1298,11 +1295,11 @@
     part of any RDF tool to accept, process, or produce anything beyond
     regular RDF triples, graphs, and datasets. </p>
 
-    <p><em>A generalized RDF triple</em> is an RDF triple generalized so
+    <p>A <dfn>generalized RDF triple</dfn> is an RDF triple generalized so
     that subjects, predicates, and objects all allowed to be IRIs, blank
-    nodes, or literals.  A <em>generalized RDF graph</em> is an RDF graph of
+    nodes, or literals.  A <dfn>generalized RDF graph</dfn> is an RDF graph of
     generalized RDF triples, i.e., a set of generalized RDF triples.
-    A <em>generalized RDF dataset</em> is an RDF dataset of generalized RDF
+    A <dfn>generalized RDF dataset</dfn> is an RDF dataset of generalized RDF
     graphs where graph labels can be IRIs, blank nodes, or literals.</p>
 
 </section>
@@ -1399,6 +1396,7 @@
   <em>RDF 1.1 Concepts and Abstract Syntax</em>.</p>
 
   <ul>
+		<li>2013-07-03: Editorial changes in response to <a href="http://lists.w3.org/Archives/Public/public-rdf-wg/2013Jul/0003.html">a review by Markus Lanthaler</a> and a <a href="http://lists.w3.org/Archives/Public/public-rdf-wg/2013Jul/0026.html">related request</a></li>
 	  <li>2013-06-27: Added informative section on generalized RDF triples, graphs, and
 	  datasets.</li>
 	  <li>2013-06-27: Added caution on the use of graph names as blank nodes.</li>