--- a/spec/latest/json-ld-syntax/index.html Mon Dec 03 20:27:26 2012 +0100
+++ b/spec/latest/json-ld-syntax/index.html Tue Dec 04 17:51:07 2012 +0100
@@ -297,68 +297,6 @@
</section>
<section class="normative">
- <h1>Data Model</h1>
-
- <p>JSON-LD is a serialization format for <tref>Linked Data</tref> based on JSON.
- It is therefore important to distinguish between the syntax, which is defined
- by JSON in [[RFC4627]], and <tdef title="JSON-LD data model">JSON-LD's data model</tdef>
- which is defined as follows:</p>
-
- <ul>
- <li>A <tdef>JSON-LD document</tdef> serializes a collection of
- <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 default graph does not have a name and MAY be empty.</li>
- <li>Each named graph is a pair consisting of an <tref>IRI</tref> or <tref>blank node</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>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>. 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 node having an outgoing edge MUST be an <tref>IRI</tref> or a
- <tref>blank node</tref>.</li>
- <li>A <tref>JSON-LD graph</tref> SHOULD NOT contain unconnected <tref title="node">nodes</tref>,
- i.e., nodes which are not connected by an <tref>edge</tref> to any other <tref>node</tref>.</li>
- <li>An <tdef><abbr title="Internationalized Resource Identifier">IRI</abbr></tdef>
- (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 blank node 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
- by 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>.
- Blank node identifiers begin with <code>_:</code>.</li>
- <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>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
- be normalized to lowercase.</li>
- <li>A <tdef>list</tdef> is an ordered sequence of <tref title="IRI">IRIs</tref>,
- <tref title="blank node">blank nodes</tref>, and
- <tref title="JSON-LD value">JSON-LD values</tref>.</li>
- </ul>
-
- <p><tref title="JSON-LD document">JSON-LD documents</tref> MAY contain data that cannot be
- represented by the <tref title="JSON-LD data model">data model</tref> defined above.
- Unless otherwise specified, such data is ignored when a <tref>JSON-LD document</tref>
- is being processed. This means, e.g., that properties which are not mapped to an
- <tref>IRI</tref> or <tref>blank node</tref> will be ignored.</p>
-
- <p style="text-align: center"><img src="linked-data-graph.png" title="An illustration of JSON-LD's data model"></p>
- <p style="text-align: center">Figure 1: An illustration of JSON-LD's data model.</p>
-</section>
-
-<section class="normative">
<h1>Terminology</h1>
<section>
@@ -2597,6 +2535,68 @@
</section>
<section class="appendix normative">
+ <h1>Data Model</h1>
+
+ <p>JSON-LD is a serialization format for <tref>Linked Data</tref> based on JSON.
+ It is therefore important to distinguish between the syntax, which is defined
+ by JSON in [[RFC4627]], and <tdef title="JSON-LD data model">JSON-LD's data model</tdef>
+ which is defined as follows:</p>
+
+ <ul>
+ <li>A <tdef>JSON-LD document</tdef> serializes a collection of
+ <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 default graph does not have a name and MAY be empty.</li>
+ <li>Each named graph is a pair consisting of an <tref>IRI</tref> or <tref>blank node</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>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>. 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 node having an outgoing edge MUST be an <tref>IRI</tref> or a
+ <tref>blank node</tref>.</li>
+ <li>A <tref>JSON-LD graph</tref> SHOULD NOT contain unconnected <tref title="node">nodes</tref>,
+ i.e., nodes which are not connected by an <tref>edge</tref> to any other <tref>node</tref>.</li>
+ <li>An <tdef><abbr title="Internationalized Resource Identifier">IRI</abbr></tdef>
+ (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 blank node 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
+ by 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>.
+ Blank node identifiers begin with <code>_:</code>.</li>
+ <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>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
+ be normalized to lowercase.</li>
+ <li>A <tdef>list</tdef> is an ordered sequence of <tref title="IRI">IRIs</tref>,
+ <tref title="blank node">blank nodes</tref>, and
+ <tref title="JSON-LD value">JSON-LD values</tref>.</li>
+ </ul>
+
+ <p><tref title="JSON-LD document">JSON-LD documents</tref> MAY contain data that cannot be
+ represented by the <tref title="JSON-LD data model">data model</tref> defined above.
+ Unless otherwise specified, such data is ignored when a <tref>JSON-LD document</tref>
+ is being processed. This means, e.g., that properties which are not mapped to an
+ <tref>IRI</tref> or <tref>blank node</tref> will be ignored.</p>
+
+ <p style="text-align: center"><img src="linked-data-graph.png" title="An illustration of JSON-LD's data model"></p>
+ <p style="text-align: center">Figure 1: An illustration of JSON-LD's data model.</p>
+</section>
+
+<section class="appendix normative">
<h2>JSON-LD Grammar</h2>
<em>This section is normative</em>