--- a/spec/latest/json-ld-api/index.html Mon Jan 16 16:23:38 2012 -0500
+++ b/spec/latest/json-ld-api/index.html Tue Jan 17 19:17:43 2012 -0800
@@ -789,41 +789,41 @@
<li>Merge the of <tref>local context</tref> into the <tref>active context</tref>.</li>
</ol>
</li>
- </ol>
- </li>
- <li>If <em>value</em> is a <tref>JSON object</tref>, perform the following steps:
- <ol class="algorithm">
- <li>If <em>value</em> has a <code>@language</code> key, it MUST have a value of a
- simple <tref>string</tref> or <code>null</code>. Add the language to the <tref>local context</tref>.</li>
- <li>Otherwise, for each key in <em>value</em> having the lexical form of <cite><a
- href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName">NCName</a></cite> (see [[XML-NAMES]]),
- or is an empty string,
+ <li>If <em>value</em> is a <tref>JSON object</tref>, perform the following steps:
<ol class="algorithm">
- <li>If the key's value is a simple <tref>string</tref>, the value MUST have the form of
- <tref>term</tref>, <tref>prefix</tref>:suffix, absolute IRI. Determine the IRI mapping value by
- performing <a href="#iri-expansion">IRI Expansion</a> on the associated value. If the result of the IRI
- mapping is an absolute IRI, merge the key-value pair into the <tref>local context</tref>
- <tref>term mapping</tref>.</li>
- <li id="object-context">Otherwise, the key's value MUST be a <tref>JSON object</tref>.
+ <li>If <em>value</em> has a <code>@language</code> key, it MUST have a value of a
+ simple <tref>string</tref> or <code>null</code>. Add the language to the <tref>local context</tref>.</li>
+ <li id="object-context">Otherwise, for each key in <em>value</em> having the lexical form of an <cite><a
+ href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName">NCName</a></cite> (see [[XML-NAMES]]),
+ or being an empty string, perform the following steps:
<ol class="algorithm">
- <li>The value MUST have a <code>@id</code> key with a string value, the value MUST have the
- form of <tref>term</tref>, <tref>prefix</tref>:suffix, absolute IRI. Determine the IRI mapping value
- by performing <a href="#iri-expansion">IRI Expansion</a> on the associated value. If the result of
- the IRI mapping is an absolute IRI, merge the key-value pair into the <tref>local context</tref>
+ <li>If the key's value is a simple <tref>string</tref>, the value MUST have the form of
+ <tref>term</tref>, <tref>prefix</tref>:suffix, absolute IRI. Determine the IRI mapping value by
+ performing <a href="#iri-expansion">IRI Expansion</a> on the associated value. If the result of the IRI
+ mapping is an absolute IRI, merge the key-value pair into the <tref>local context</tref>
<tref>term mapping</tref>.</li>
- <li>If the value has a <code>@type</code> key, the value MUST have the form of <tref>term</tref>,
- <tref>prefix</tref>:suffix, absolute IRI or the <tref>keyword</tref> <code>@id</code>. Determine the IRI by
- performing <a href="#iri-expansion">IRI Expansion</a> on the associated value. If the result of the
- IRI mapping is an absolute IRI or <code>@id</code>, merge into the <tref>local context</tref>
- <tref>coercion mapping</tref>.</li>
- <li>If the value has a <code>@list</code> key, the value MUST be
- <code>true</code> or <code>false</code>. Merge into the <tref>local context</tref> <tref>list
- mapping</tref>.</li>
+ <li>Otherwise, the key's value MUST be a <tref>JSON object</tref>.
+ <ol class="algorithm">
+ <li>The value MUST have a <code>@id</code> key with a string value, the value MUST have the
+ form of <tref>term</tref>, <tref>prefix</tref>:suffix, absolute IRI. Determine the IRI mapping value
+ by performing <a href="#iri-expansion">IRI Expansion</a> on the associated value. If the result of
+ the IRI mapping is an absolute IRI, merge the key-value pair into the <tref>local context</tref>
+ <tref>term mapping</tref>.</li>
+ <li>If the value has a <code>@type</code> key, the value MUST have the form of <tref>term</tref>,
+ <tref>prefix</tref>:suffix, absolute IRI or the <tref>keyword</tref> <code>@id</code>. Determine the IRI by
+ performing <a href="#iri-expansion">IRI Expansion</a> on the associated value. If the result of the
+ IRI mapping is an absolute IRI or <code>@id</code>, merge into the <tref>local context</tref>
+ <tref>coercion mapping</tref>.</li>
+ <li>If the value has a <code>@list</code> key, the value MUST be
+ <code>true</code> or <code>false</code>. Merge into the <tref>local context</tref> <tref>list
+ mapping</tref>.</li>
+ </ol>
+ </li>
+ <li>Merge the <tref>local context</tref> into the <tref>active context</tref>.</li>
+ <li>Repeat <a href="#object-context">Step 2.3.2</a> until no entries are added to the <tref>local
+ context</tref>.</li>
</ol>
</li>
- <li>Merge the <tref>local context</tref> into the <tref>active context</tref>.</li>
- <li>Repeat <a href="#object-context">Step 3.2</a> until no entries are added to the <tref>local
- context</tref>.</li>
</ol>
</li>
</ol>
@@ -833,7 +833,7 @@
<p class="note">It can be difficult to distinguish between a <code>prefix:suffix</code> and an absolute IRI,
as a <tref>prefix</tref> may seem to be a valid IRI <em>scheme</em>. When performing repeated IRI expansion,
a term used as a prefix may not have a valid mapping due to dependencies in resolving term definitions. By
- continuing <a href="#object-context">Step 3.2</a> until no changes are made, mappings to IRIs created
+ continuing <a href="#object-context">Step 2.3.2</a> until no changes are made, mappings to IRIs created
using an undefined term prefix will eventually resolve to absolute IRIs.</p>
<p class="issue"><a href="https://github.com/json-ld/json-ld.org/issues/43">Issue 43</a>