Partially revert "Minor fixes and tweaks to JSON-LD Data Model."
authorMarkus Lanthaler <mark_lanthaler@gmx.net>
Tue, 29 Jan 2013 18:07:19 +0100
changeset 1168 4864c4052c79
parent 1167 44f77bc9afc2
child 1169 6a3d1cfc3be4
Partially revert "Minor fixes and tweaks to JSON-LD Data Model."

This partially reverts commit cc034077d5177f85fdccc69a5ac8062e66368e93.

@msporny: The graph name is an IRI or blank node identifier.. this is what we agreed to, right?
spec/latest/json-ld-syntax/index.html
--- a/spec/latest/json-ld-syntax/index.html	Tue Jan 29 17:25:36 2013 +0100
+++ b/spec/latest/json-ld-syntax/index.html	Tue Jan 29 18:07:19 2013 +0100
@@ -2555,21 +2555,17 @@
       <tref title="JSON-LD graph">JSON-LD graphs</tref> and comprises exactly one
       <tdef>default graph</tdef> and zero or more <tdef title="named graph">named graphs</tdef>.</li>
     <li>The <tref>default graph</tref> does not have a name and MAY be empty.</li>
-    <li>Each <tref>named graph</tref> is a pair consisting of a <tdef>graph name</tdef>
-      and a <tref>JSON-LD graph</tref>. The
-      <tref>graph name</tref> SHOULD be an <tref>IRI</tref> or
-      <tref>blank node identifier</tref>.</li>
-    <li>A <tdef>JSON-LD graph</tdef> is a labeled directed graph containing
-      a set of zero or more <tref title="node">nodes</tref> connected by
-      <tref title="edge">edges</tref>.</li>
+    <li>Each <tref>named graph</tref> is a pair consisting of an <tref>IRI</tref> or
+      <tref>blank node identifier</tref> (the <tdef>graph name</tdef>) and a <tref>JSON-LD graph</tref>.
+      Whenever possible, the <tref>graph name</tref> SHOULD be an <tref>IRI</tref>.</li>
+    <li>A <tdef>JSON-LD graph</tdef> is a labeled directed graph, i.e., a set of
+      <tref title="node">nodes</tref> connected by <tref title="edge">edges</tref>.</li>
     <li>Every <tdef>edge</tdef> has a direction associated with it and is labeled with
       an <tref>IRI</tref> or a <tref>blank node identifier</tref>. Within the JSON-LD syntax
-      these edge labels are called <tdef title="property">properties</tdef>.</li>
-    <li>Every <tdef>node</tdef> represents a <tdef>resource</tdef> or a
-      <tdef>value</tdef>. <tref title="resource">Resources</tref> are labeled
-      using either an <tref>IRI</tref> or a <tref>blank node identifier</tref>.
-      <tref title="value">Values</tref> are a
-      <tref>JSON-LD value</tref> or a <tref>list</tref>.</li>
+      these edge labels are called <tdef title="property">properties</tdef>. Whenever possible, an
+      <tref>edge</tref> SHOULD be labeled with an <tref>IRI</tref>.</li>
+    <li>Every <tdef>node</tdef> is an <tref>IRI</tref>, a <tref>blank node</tref>,
+      a <tref>JSON-LD value</tref>, or a <tref>list</tref>.</li>
     <li>A <tref>node</tref> having an outgoing edge MUST be an <tref>IRI</tref> or a
       <tref>blank node</tref>.</li>
     <li>A <tref>JSON-LD graph</tref> MUST NOT contain unconnected <tref title="node">nodes</tref>,
@@ -2578,9 +2574,9 @@
       (Internationalized Resource Identifier) is a string that conforms to the syntax
       defined in [[RFC3987]]. <tref title="IRI">IRIs</tref> used within a
       <tref>JSON-LD graph</tref> SHOULD return a <tref>Linked Data</tref> document describing
-      the resource denoted by that IRI when being dereferenced.</li>
-    <li>A <tdef>blank node</tdef> is a <tref>resource</tref> which is not
-      labeled with an <tref>IRI</tref>. A blank node MAY be identified
+      the resource denoted by that <tref>IRI</tref> when being dereferenced.</li>
+    <li>A <tdef>blank node</tdef> is a <tref>node</tref> which is neither an <tref>IRI</tref>,
+      nor a <tref>JSON-LD value</tref>, or a <tref>list</tref>. A blank node MAY be identified
       using a <tref>blank node identifier</tref>.</li>
     <li>A <tdef>blank node identifier</tdef> is a string that can be used as an identifier
       for a <tref>blank node</tref> within the scope of a <tref>JSON-LD document</tref>.
@@ -2588,7 +2584,8 @@
     <li>A <tdef>JSON-LD value</tdef> is a <tref>string</tref>, a <tref>number</tref>,
       <tref>true</tref> or <tref>false</tref>, a <tref>typed value</tref>, or a
       <tref>language-tagged string</tref>.</li>
-    <li>A <tdef>typed value</tdef> consists of a value, which is a string, and a type, which is an IRI.</li>
+    <li>A <tdef>typed value</tdef> consists of a value, which is a string, and a type, which is an
+      <tref>IRI</tref>.</li>
     <li>A <tdef>language-tagged string</tdef> consists of a string and a non-empty language
       tag as defined by [[BCP47]]. The language tag MUST be well-formed according to section
       <a href="http://tools.ietf.org/html/bcp47#section-2.2.9">2.2.9</a> of [[BCP47]], and MUST