Simplify term definition creation, disallow @type in property generator.
--- a/spec/latest/json-ld-api/alternate2.html Mon Feb 11 13:58:07 2013 -0500
+++ b/spec/latest/json-ld-api/alternate2.html Mon Feb 11 14:22:42 2013 -0500
@@ -1261,12 +1261,12 @@
For each item <em>iri</em> in <em>id</em>:
<ol class="algorithm">
<li>
- <em>iri</em> MUST be a <tref>string</tref>, otherwise an
- invalid value has been detected, which is an error.
+ <em>iri</em> MUST be a <tref>string</tref> and MUST not
+ equal <code>@type</code>, otherwise an invalid value has
+ been detected, which is an error.
</li>
<li>
- If <em>iri</em> does not equal <code>@type</code> then
- set it equal to the result of using the
+ Set <em>iri</em> equal to the result of using the
<a href="#iri-expansion">IRI Expansion</a> algorithm, passing
<tref>active context</tref>, <em>iri</em> for <em>value</em>,
<tref>true</tref> for <em>documentRelative</em>,
@@ -1286,13 +1286,13 @@
</li>
<li>
Otherwise <em>id</em> MUST be a <tref>string</tref>, otherwise
- an invalid value has been detected, which is an error. If <em>id</em>
- does not equal <code>@type</code> then set it equal to the result of using the
+ an invalid value has been detected, which is an error. Set the
+ <tref>IRI mapping</tref> for <em>definition</em>
+ equal to the result of using the
<a href="#iri-expansion">IRI Expansion</a> algorithm, passing
<tref>active context</tref>, <em>id</em> for <em>value</em>,
<tref>true</tref> for <em>documentRelative</em>,
- <tref>local context</tref>, and <em>defined</em>. Set the
- <tref>IRI mapping</tref> for <em>definition</em> to <em>id</em>.
+ <tref>local context</tref>, and <em>defined</em>.
</li>
</ol>
</li>