Merging upstream changes
authorYves Raimond <yves.raimond@bbc.co.uk>
Tue, 05 Nov 2013 17:17:02 +0000
changeset 1224 7a8a0146e9a2
parent 1223 1cca862ddabf (current diff)
parent 1222 32a6c6a016a8 (diff)
child 1225 e42c79a3ee67
child 1229 463ead2e85bb
Merging upstream changes
--- a/rdf-schema/index.html	Tue Nov 05 17:15:13 2013 +0000
+++ b/rdf-schema/index.html	Tue Nov 05 17:17:02 2013 +0000
@@ -119,7 +119,12 @@
 
   <section id="sotd">
 
-  @@ edited rec
+  This document is an edited version of the 2004 RDF Schema
+  Recommendation. The purpose of this revision is to
+  make this document available as part of the RDF 1.1 document
+  set. Changes are limited to revised references and terminology
+  updates. The technical content of the document is unchanged. Detaos of the chnages
+  are listed in the <a href="#PER-changes">Changes</a> section.    
   
   </section>
 </div>
@@ -130,12 +135,13 @@
 <p>The Resource Description Framework (RDF) is a general-purpose language for
 representing information in the Web.</p>
 
-<p>@@ update: This specification introduces RDF's vocabulary description language, RDF
-Schema. It is complemented by several companion documents which describe
-RDF's XML encoding [<a href="#ref-rdf-syntax">RDF-SYNTAX</a>], mathematical foundations [<a href="#ref-rdf-semantics">RDF-SEMANTICS</a>] and Resource
-Description Framework (RDF): Concepts and Abstract Syntax [<a
-href="#ref-rdf-concepts">RDF-CONCEPTS</a>]. The RDF Primer [<a
-href="#ref-rdf-primer">RDF-PRIMER</a>] provides an informal introduction and
+<p>This specification introduces RDF's vocabulary description language, RDF
+Schema. It is complemented by several companion documents which
+describe the basic concepts and abstract stntax of RDF 
+[[!RDF11-CONCEPTS]], the formal semantics of RDF [[!RDF11-MT]], and
+various concrete syntaxes for RDF, such as Turtle [[!TURTLE]],
+TriG, [[!TRIG]], and JSON-LD [[!JSON-LD]]. 
+The RDF Primer [[RDF11-PRIMER]] provides an informal introduction and
 examples of the use of the concepts specified in this document.</p>
 
 <p>This document is intended to provide a clear specification of the RDF
@@ -146,7 +152,9 @@
 and the RDF Semantics specification, the RDF Semantics specification should
 be taken to be correct.</p>
 
-<p>RDF properties may be thought of as attributes of resources and in this sense correspond to traditional attribute-value pairs. RDF properties also represent relationships between resources.</p>
+<p>RDF properties may be thought of as attributes of resources and in
+this sense correspond to traditional attribute-value pairs. RDF
+properties also represent relationships between resources.</p> 
 
 <p>RDF however, provides no mechanisms for describing these properties, nor
 does it provide any mechanisms for describing the relationships between these
@@ -197,11 +205,19 @@
 of RDF resources that can be used to describe properties of other RDF 
 resources (including properties) in application-specific RDF 
 vocabularies. The core vocabulary is defined in a namespace informally 
-called 'rdfs' here. That namespace is identified by the IRI 
-http://www.w3.org/2000/01/rdf-schema# and is associated with the prefix 
-'rdfs'. This specification also uses the prefix 'rdf' to refer to the <a 
-href="http://www.w3.org/TR/2004/REC-rdf-syntax-grammar-20040210/#section-Namespace">RDF 
-namespace</a> http://www.w3.org/1999/02/22-rdf-syntax-ns#.</p>
+called 'rdfs' here. That namespace is identified by the IRI</p>
+
+<blockquote>
+http://www.w3.org/2000/01/rdf-schema#
+</blockquote>
+
+and is conventiuonally associated with the prefix 
+'rdfs'. This specification also uses the prefix 'rdf' to refer to the
+RDF namespace</p>
+
+<blockquote>
+http://www.w3.org/1999/02/22-rdf-syntax-ns#
+</blockquote>
 
 <p>For convenience and readability, this specification uses an abbreviated
 form to represent IRIs. A name of the form prefix:suffix should be
@@ -240,7 +256,7 @@
 classes is itself a class called <a
 href="#ch_class"><code>rdfs:Class</code></a>.</p>
 
-<p><a name="def-subclass" id="def-subclass"></a>
+<p id="def-subclass">
 If a class C is a <em>subclass</em> of a class C', then all instances of C will
 also be instances of C'. 
 The <a href="#ch_subclassof"><code>rdfs:subClassOf</code></a> property 
@@ -330,7 +346,7 @@
 describes the concept of an RDF property as a relation between subject
 resources and object resources.</p> 
 
-<p><a name="def-subproperty" id="def-subproperty"></a>
+<p id="def-subproperty">
 This specification defines the concept of subproperty. 
 The <a href="#ch_subclassof"><code>rdfs:subPropertyOf</code></a> property 
 may be used to state that one property is a subproperty of another.
@@ -572,8 +588,9 @@
 <h3>Container Classes and Properties</h3>
 
 <p>RDF containers are resources that are used to represent collections. An introduction
-to RDF containers with examples may be found in the RDF 2004 Primer
-[[RDF-PRIMER]]. The same resource may appear in a container more than
+to RDF containers with examples may be found in the <a
+href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/#containers">RDF
+2004 Primer</a>. The same resource may appear in a container more than 
 once. Unlike containment in the physical world, a container may be
 contained in itself.</p> 
 
@@ -708,10 +725,11 @@
 programming languages. There is a <a 
 href="http://www.w3.org/TR/2004/REC-rdf-syntax-grammar-20040210/#section-Syntax-parsetype-Collection">shorthand notation</a> in the RDF/XML syntax specification for representing collections.</p>
 
-<p><strong>Note</strong>:  RDFS does not require that there be only one 
+<div class="note">
+RDFS does not require that there be only one 
 first element of a list-like structure, or even that a list-like structure 
 have a first element.
-</p>
+</div>
 
 <section id="ch_list">
 <h4>rdf:List</h4>
@@ -1254,12 +1272,12 @@
 <h3>Changes for Proposed Edited Recommendation in 2013</h2>
 
 <ul>
-  <ul>Conversion to ResPec</li>
-  <li>Refereces and anchors to RDF 1.0 documents replaced by
+  <li>Conversion to ResPec</li>
+  <li>Refereces and anchors to RDF 1.0 documents where appropriate replaced by
   references and anchors to RDF 1.1 documents.</li>
-  <li>Replaced the term "URI Reference" with the "IRI". </li>
+  <li>Replaced the term "URI Reference" with the term "IRI". </li>
   <li>Removed discussion about distinction between plain and typed
-  literals, as this distinction absent in RDF 1.1 and has no technical
+  literals, as this distinction is absent in RDF 1.1 and has no technical
   bearing on RDF Schema.</li>
 </ul>