--- a/spec/latest/json-ld-framing/index.html Thu Aug 30 10:52:50 2012 +0200
+++ b/spec/latest/json-ld-framing/index.html Thu Aug 30 11:06:41 2012 +0200
@@ -344,12 +344,21 @@
<dt><tdef>null</tdef></dt><dd>
The use of the <tref>null</tref> value within JSON-LD is used to ignore or reset values.
</dd>
- <dt><tdef>node definition</tdef></dt><dd>
- A <tref>JSON object</tref> used to represent a <tref>node</tref> and one or more properties
- of that node. A <tref>JSON object</tref> is a node definition if it does not contain the keys
- <code>@value</code>, <code>@list</code> or <code>@set</code> and it has one or more keys other than <code>@id</code>.</dd>
- <dt><tdef>node reference</tdef></dt><dd>
- A <tref>JSON object</tref> used to reference a node having only the <code>@id</code> key.</dd>
+ <dt><tdef>keyword</tdef></dt>
+ <dd>
+ A JSON key that is specific to JSON-LD, specified in the JSON-LD Syntax specification [[!JSON-LD]]
+ in the section titled <a href="../json-ld-syntax/#syntax-tokens-and-keywords">Syntax Tokens and Keywords</a>.
+ </dd>
+ <dt><tdef>node definition</tdef></dt>
+ <dd>
+ A <tref>JSON object</tref> used to represent a <tref>node</tref> and one or more properties of that node.
+ A <tref>JSON object</tref> is a node definition if it does not contain the keys <code>@value</code>,
+ <code>@list</code> or <code>@set</code> and it has one or more keys other than <code>@id</code>.
+ </dd>
+ <dt><tdef>node reference</tdef></dt>
+ <dd>
+ A <tref>JSON object</tref> used to reference a node having only the <code>@id</code> key.
+ </dd>
</dl>
</p>
</section>
@@ -536,31 +545,26 @@
<section>
<h2>Syntax Tokens and Keywords</h2>
- <p>JSON-LD specifies a number of syntax tokens and <tdef>keyword</tdef>s that are using
- in all algorithms described in this section:</p>
+ <p>This specification adds a number of <tref title="keyword">keywords</tref> to
+ the ones defined in the [[!JSON-LD]] specification:</p>
<dl>
- <dt><code>@context</code></dt><dd>Used to set the <tref>local context</tref>.</dd>
- <dt><code>@id</code></dt><dd>Sets the active subject.</dd>
- <dt><code>@language</code></dt><dd>Used to specify the language for a literal.</dd>
- <dt><code>@type</code></dt><dd>Used to set the type of the active subject or the datatype of a literal.</dd>
- <dt><code>@value</code></dt><dd>Used to specify the value of a literal.</dd>
- <dt><code>@container</code></dt><dd>Used to set the container of a particular value.</dd>
- <dt><code>@list</code></dt><dd>Used to express an ordered set of data.</dd>
- <dt><code>@set</code></dt><dd>Used to express an unordered set of data.</dd>
- <dt><code>@graph</code></dt><dd>Used to explicitly express a <tref>linked data graph</tref>.</dd>
- <dt><code>:</code></dt><dd>The separator for JSON keys and values that use <tref title="compact_iri">compact IRIs</tref>.</dd>
- <dt><code>@default</code></dt><dd>Used in <a href="#framing">Framing</a> to set the default value for
- an output property when the framed <tref>node definition</tref> does not include such a property.</dd>
- <dt><code>@explicit</code></dt><dd>Used in <a href="#framing">Framing</a> to override the
- value of <tref>explicit inclusion flag</tref> within a specific frame.</dd>
- <dt><code>@omitDefault</code></dt><dd>Used in <a href="#framing">Framing</a> to override the
- value of <tref>omit default flag</tref> within a specific frame.</dd>
- <dt><code>@embed</code></dt><dd>Used in <a href="#framing">Framing</a> to override the
- value of <tref>object embed flag</tref> within a specific frame.</dd>
- <dt><code>@null</code></dt><dd>Used in <a href="#framing">Framing</a> when a value of <tref>null</tref>
- should be returned, which would otherwise be removed when
- <a href="../json-ld-api/index.html#compaction">Compacting</a>.</dd>
+ <dt><code>@default</code></dt>
+ <dd>Used in <a href="#framing">Framing</a> to set the default value for
+ an output property when the framed <tref>node definition</tref> does not include such a property.</dd>
+ <dt><code>@explicit</code></dt>
+ <dd>Used in <a href="#framing">Framing</a> to override the
+ value of <tref>explicit inclusion flag</tref> within a specific frame.</dd>
+ <dt><code>@omitDefault</code></dt>
+ <dd>Used in <a href="#framing">Framing</a> to override the
+ value of <tref>omit default flag</tref> within a specific frame.</dd>
+ <dt><code>@embed</code></dt>
+ <dd>Used in <a href="#framing">Framing</a> to override the
+ value of <tref>object embed flag</tref> within a specific frame.</dd>
+ <dt><code>@null</code></dt>
+ <dd>Used in <a href="#framing">Framing</a> when a value of <tref>null</tref>
+ should be returned, which would otherwise be removed when
+ <a href="../json-ld-api/index.html#compaction">Compacting</a>.</dd>
</dl>
<p>All JSON-LD tokens and keywords are case-sensitive.</p>