Merge
authorGavin Carothers <gavin@carothers.name>
Wed, 25 Apr 2012 17:00:33 -0700
changeset 258 507998a7685b
parent 257 7d796fb0f976 (current diff)
parent 254 19c4cb31911c (diff)
child 259 c790e286bd6d
child 260 559916600db6
child 267 e105b38c0a78
Merge
--- a/rdf-concepts/index.html	Wed Apr 25 16:59:23 2012 -0700
+++ b/rdf-concepts/index.html	Wed Apr 25 17:00:33 2012 -0700
@@ -394,8 +394,6 @@
     <p>An RDF triple is conventionally written in the order subject,
     predicate, object.</p>
     
-    <p>The predicate is also known as the <dfn>property</dfn> of the triple.</p>
-
     <p>The set of <dfn title="node">nodes</dfn> of an <a>RDF graph</a>
     is the set of subjects and objects of triples in the graph.
     Predicate IRIs MAY also appear as nodes in the graph.</p>
@@ -492,7 +490,7 @@
 
     <ul>
     <li>a <dfn>lexical form</dfn> being a Unicode [[!UNICODE]] string,
-    which should be in Normal Form C [[!NFC]],</li>
+    which SHOULD be in Normal Form C [[!NFC]],</li>
     <li>a <dfn>datatype IRI</dfn> being an <a>IRI</a> that establishes
     the <a>literal value</a>.</li>
     </ul>
@@ -996,10 +994,10 @@
     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 in the
-    <a>datatype map</a>,</strong> then the literal value is
-    not defined by this specification.</li>
+    implementation-defined <a>datatype map</a>,</strong> then the literal value
+    is not defined by this specification.</li>
     <li>Let <em>d</em> be the <a>datatype</a> associated with the
-    datatype IRI in the datatype map.</li> 
+    datatype IRI in the implementation-defined datatype map.</li> 
     <li><strong>If the literal's <a>lexical form</a> is in the
     <a>lexical space</a> of <em>d</em>,</strong> then the literal value
     is the result of applying the <a>lexical-to-value mapping</a>
@@ -1119,11 +1117,11 @@
 
     <p>Primary resources may have multiple representations
     (a.k.a. content negotiation). Fragments in RDF-bearing representations
-    SHOULD be used consistently with the semantics imposed by any
+    should be used consistently with the semantics imposed by any
     non-RDF representations. For example, if the fragment
     <code>#chapter1</code> identifies a document section in an
     HTML representation of a primary resource, then <code>#chapter1</code>
-    SHOULD be taken to denote that same section in all RDF-bearing
+    should be taken to denote that same section in all RDF-bearing
     representations of the same primary resource.</p>
 
     <p>Likewise, RDF graphs embedded in non-RDF representations
@@ -1161,6 +1159,7 @@
   <h2>Changes from RDF 2004</h2>
 
   <ul>
+    <li>2012-04-26: Remove normative definition of “property” as it disagreed with RDF Semantics; small editorial changes.</li>
     <li>2011-11-21: Updated XHTML 1.0 reference to XHTML 1.1</li>
     <li>2011-11-20: Added table of <a>RDF-compatible XSD types</a>, and definition of <a>datatype map</a>, both adapted from previous content in [[RDF-MT]]
     <li>2011-11-18: Replaced informative <em>Introduction</em> and <em>RDF Concepts</em> sections with a new extended introduction. Folded some content from <em>RDF Concepts</em> into the later normative sections, mostly as examples and notes.</li>