--- a/spec/latest/json-ld-api/alternate2.html Mon Feb 04 12:32:02 2013 -0500
+++ b/spec/latest/json-ld-api/alternate2.html Mon Feb 04 14:45:12 2013 -0500
@@ -1345,7 +1345,7 @@
<li>
Initialize <em>container</em> equal to the value associated with the
<code>@container</code> key, which MUST be either:
- <code>@list</code>, <code>@set</code>, <code>@annotation</code>,
+ <code>@list</code>, <code>@set</code>, <code>@index</code>,
or <code>@language</code>. Otherwise, an invalid value has been
detected, which is an error.
</li>
@@ -1575,7 +1575,7 @@
<em>expanded value</em> to lowercased <em>value</em>.
</li>
<li>
- If <em>expanded property</em> is <code>@annotation</code>
+ If <em>expanded property</em> is <code>@index</code>
then <em>value</em> MUST be a <tref>string</tref>, otherwise an
invalid value has been detected, which is an error.
</li>
@@ -1624,37 +1624,37 @@
</li>
<li>
If <em>key</em>'s <tref>container mapping</tref> in
- <tref>active context</tref> is <code>@annotation</code> and
+ <tref>active context</tref> is <code>@index</code> and
<em>value</em> is a <tref>JSON object</tref> then <em>value</em>
- is expanded from an annotation map as follows:
+ is expanded from an index map as follows:
<ol class="algorithm">
<li>
Initialize <em>expanded value</em> to an empty
<tref>array</tref>.
</li>
<li>
- For each key <em>annotation</em> and value
- <em>annotation value</em> in <em>value</em>, ordered
- lexicographically by <em>annotation</em>:
+ For each key <em>index</em> and value
+ <em>index value</em> in <em>value</em>, ordered
+ lexicographically by <em>index</em>:
<ol class="algorithm">
<li>
- If <em>annotation value</em> is not an <tref>array</tref>
+ If <em>index value</em> is not an <tref>array</tref>
set it to an <tref>array</tref> containing only
- <em>annotation value</em>.
+ <em>index value</em>.
</li>
<li>
- Initialize <em>annotation value</em> to the result of
+ Initialize <em>index value</em> to the result of
using this algorithm recursively, passing
<tref>active context</tref>, <tref>active property</tref>,
- <em>annotation value</em> as <em>element</em>, and
+ <em>index value</em> as <em>element</em>, and
<tref>false</tref> for <em>insideList</em>.
<li>
- For each <em>item</em> in <em>annotation value</em>:
+ For each <em>item</em> in <em>index value</em>:
<ol class="algorithm">
<li>
If <em>item</em> does not have the key
- <code>@annotation</code>, add the key-value pair
- (<code>@annotation</code>-<em>annotation</em>) to
+ <code>@index</code>, add the key-value pair
+ (<code>@index</code>-<em>index</em>) to
<em>item</em>.
</li>
<li>
@@ -1732,7 +1732,7 @@
</li>
<li>
Otherwise, if <em>expanded property</em> is
- <code>@annotation</code>, <code>@id</code>, <code>@type</code>,
+ <code>@index</code>, <code>@id</code>, <code>@type</code>,
<code>@value</code>, or <code>@language</code>, then
set key <em>expanded property</em>'s value to
<em>expanded value</em> in <em>result</em>.
@@ -1752,7 +1752,7 @@
<li>
The <em>result</em> MUST NOT contain any keys other than
<code>@value</code>, <code>@language</code>, <code>@type</code>,
- and <code>@annotation</code>. It MUST NOT contain both the
+ and <code>@index</code>. It MUST NOT contain both the
<code>@language</code> key and the <code>@type</code> key.
Otherwise, an invalid value has been detected, which is an error.
</li>
@@ -1779,7 +1779,7 @@
<ol class="algorithm">
<li>
The <em>result</em> MUST contain at most one other key and that
- key MUST be <code>@annotation</code>. Otherwise, an invalid
+ key MUST be <code>@index</code>. Otherwise, an invalid
value has been detected, which is an error.
</li>
<li>
@@ -2485,7 +2485,7 @@
<a href="#value-compaction">Value Compaction</a> algorithm. Some data
will be reshaped based on
<tref title="container mapping">container mappings</tref> specified
- in the context such as <code>@annotation</code> or <code>@language</code>
+ in the context such as <code>@index</code> or <code>@language</code>
maps.
</li>
<li>
@@ -2668,14 +2668,14 @@
</ol>
</li>
<li>
- If <em>expanded property</em> equals <code>@annotation</code>:
+ If <em>expanded property</em> equals <code>@index</code>:
<ol class="algorithm">
<li>
If <tref>active property</tref> has a
<tref>container mapping</tref> in <tref>active context</tref>
- that equals <code>@annotation</code>, then the compacted
- result will be inside of an <code>@annotation</code>
- container, so simply drop the <code>@annotation</code>
+ that equals <code>@index</code>, then the compacted
+ result will be inside of an <code>@index</code>
+ container, so simply drop the <code>@index</code>
property by continuing to the next
<em>expanded property</em>.
</li>
@@ -2775,14 +2775,14 @@
</li>
<li>
If <em>expanded item</em> contains the key
- <code>@annotation</code>, then add a key-value pair
+ <code>@index</code>, then add a key-value pair
to <em>compacted item</em> where the key is the
result of the
<a href="#iri-compaction-algorithm">IRI Compaction</a>
algorithm, passing <tref>active context</tref> and
- <code>@annotation</code> for <em>iri</em>, and the
+ <code>@index</code> for <em>iri</em>, and the
value is the value associated with the
- <code>@annotation</code> key in
+ <code>@index</code> key in
<em>expanded item</em>.
</li>
</ol>
@@ -2798,7 +2798,7 @@
</li>
<li>
If <em>container</em> equals <code>@language</code> or
- <code>@annotation</code>:
+ <code>@index</code>:
<ol class="algorithm">
<li>
If <em>active property</em> is a key in <em>result</em>,
@@ -4105,11 +4105,11 @@
<li>If <em>element</em> has an <code>@type</code> member, merge each value into the <code>@type</code>
of <tref>active subject</tref> in <em>activeGraph</em>. Then remove the <code>@type</code> member
from <em>element</em>.</li>
- <li>If <em>element</em> has an <code>@annotation</code> member, set the <code>@annotation</code>
+ <li>If <em>element</em> has an <code>@index</code> member, set the <code>@index</code>
of <tref>active subject</tref> in <em>activeGraph</em> to its value. If such a member already
exists in <tref>active subject</tref> and has a different value, raise a
<code class="error">CONFLICTING_ANNOTATION</code> error. Otherwise continue and remove the
- <code>@annotation</code> from <em>element</em>.</li>
+ <code>@index</code> from <em>element</em>.</li>
<li>If <em>element</em> has an <code>@graph</code> member, recursively invoke this algorithm passing
the value of the <code>@graph</code> member as new <em>element</em> and <em>id</em> as new
<tref>active subject</tref>. Then remove the <code>@graph</code> member from <em>element</em>.</li>
@@ -4792,8 +4792,8 @@
<dd>A list of lists was detected. List of lists are not supported in
this version of JSON-LD due to the algorithmic complexity associated
with conversion to RDF.</dd>
- <dt>invalid @annotation value</dt>
- <dd>An <code>@annotation</code> member was encountered whose value was
+ <dt>invalid @index value</dt>
+ <dd>An <code>@index</code> member was encountered whose value was
not a <tref>string</tref>.</dd>
<dt>invalid @id value</dt>
<dd>An <code>@id</code> member was encountered whose value was not a
@@ -4833,7 +4833,7 @@
<dt>invalid container mapping</dt>
<dd>An <code>@container</code> member was encountered whose value was
not one of the following <tref title="string">strings</tref>:
- <code>@list</code>, <code>@set</code>, or <code>@annotation</code>.</dd>
+ <code>@list</code>, <code>@set</code>, or <code>@index</code>.</dd>
<dt>invalid property generator</dt>
<dd>A non-<tref>string</tref> value has been detected in a
<tref title="property generator">property generator's</tref>