--- a/spec/latest/json-ld/index.html Mon Apr 01 21:12:38 2013 +0200
+++ b/spec/latest/json-ld/index.html Mon Apr 01 23:04:51 2013 +0200
@@ -450,7 +450,7 @@
<section class="informative">
<h2>The Context</h2>
- <p>Simply speaking, a <tdef>context</tdef> is used to map <tref title="term">terms</tref>, to
+ <p>Simply speaking, a <tdef>context</tdef> is used to map <tref title="term">terms</tref> to
<tref title="IRI">IRIs</tref>. <tref title="term">Terms</tref> are case sensitive
and any valid <tref>string</tref> that is not a reserved JSON-LD <tref>keyword</tref>
can be used as a <tref>term</tref>.</p>
@@ -841,7 +841,7 @@
<p>At times, all properties and types may come from the same vocabulary. JSON-LD's
<code>@vocab</code> keyword allows an author to set a common prefix to be used
- for all properties and types that do not match a <tref>term</tref> or are neither
+ for all properties and types that do not match a <tref>term</tref> and are neither
a <tref>compact IRI</tref> nor an <tref>absolute IRI</tref> (i.e., they do
not contain a colon).</p>
@@ -1410,7 +1410,7 @@
<tref title="keyword">JSON-LD 1.0 keywords</tref> are treated as any other term, i.e.,
they are ignored unless mapped to an <tref>IRI</tref>. Furthermore, the use of
empty <tref title="term">terms</tref> (<code>""</code>) is not allowed as
- not all programming languages are able to handle empty property names.</p>
+ not all programming languages are able to handle empty JSON keys.</p>
</section>
<section class="normative">
@@ -2653,8 +2653,7 @@
<p>If JSON-LD content is extracted as RDF [[RDF11-CONCEPTS]], it should be expanded into an
<tref href="http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset">RDF dataset</tref> using the
<cite><a href="../json-ld-api/#convert-to-rdf-algorithm">Convert to RDF Algorithm</a></cite>
- [[JSON-LD-API]]. If multiple embedded JSON-LD documents are extracted as RDF,
- the result is the RDF merge of the extracted datasets.</p>
+ [[JSON-LD-API]].</p>
</section>
</section>
@@ -2674,12 +2673,12 @@
<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 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>
+ Whenever practical, 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>. Whenever possible, an
+ these edge labels are called <tdef title="property">properties</tdef>. Whenever practical, 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>
@@ -2741,7 +2740,7 @@
in [[!RFC4627]].</p>
<p>A <tref>JSON-LD document</tref> MUST be a single <tref>node object</tref>
- or a JSON <tref>array</tref> containing a set of one or more
+ or an <tref>array</tref> whose elements are each
<tref title="node object">node objects</tref> at the top level.</p>
<p>In contrast to JSON, in JSON-LD the keys in <tref title="JSON object">objects</tref>
@@ -2769,7 +2768,7 @@
with an <code>@</code> character as future versions of JSON-LD may introduce
additional <tref title="keyword">keywords</tref>. Furthermore, the term MUST NOT
be an empty <tref>string</tref> (<code>""</code>) as not all programming languages
- are able to handle empty property names.</p>
+ are able to handle empty JSON keys.</p>
<p>See <a class="sectionRef" href="#the-context"></a> and
<a class="sectionRef" href="#iris"></a> for further discussion
@@ -2797,7 +2796,7 @@
a <tref>JSON-LD graph</tref> may be spread among different
<tref title="node object">node objects</tref> within a document. When
that happens, the keys of the different
- <tref title="node object">node objects</tref> are merged to create the
+ <tref title="node object">node objects</tref> need to be merged to create the
properties of the resulting <tref>node</tref>.</p>
<p>A <tref>node object</tref> MUST be a <tref>JSON object</tref>. All keys
Binary file spec/latest/json-ld/linked-data-graph.png has changed