--- a/spec/latest/json-ld-api/index.html Wed Mar 27 10:45:36 2013 -0400
+++ b/spec/latest/json-ld-api/index.html Wed Mar 27 15:44:11 2013 +0100
@@ -1046,8 +1046,8 @@
<li>Expand <i>value</i> by setting it to the result of
using the <a href="#iri-expansion">IRI Expansion algorithm</a>,
passing <tref>active context</tref>, <i>value</i>,
- <tref>true</tref> for <i>vocabRelative</i>,
- <tref>true</tref> for <i>documentRelative</i>,
+ <tref>true</tref> for <i>vocab</i>,
+ <tref>true</tref> for <i>document relative</i>,
<tref>local context</tref>, and <i>defined</i>.</li>
<li>If <i>value</i> is <code>@context</code>, an
<code class="error"><a href="#idl-def-JsonLdErrorCode.invalid-keyword-alias">invalid keyword alias</a></code>
@@ -1076,7 +1076,7 @@
result of using the <a href="#iri-expansion">IRI Expansion algorithm</a>,
passing <tref>active context</tref>, the value associated with
the <code>@reverse</code> key for <i>value</i>, <tref>true</tref>
- for <i>vocabRelative</i>, <tref>true</tref> for <i>documentRelative</i>,
+ for <i>vocab</i>, <tref>true</tref> for <i>document relative</i>,
<tref>local context</tref>, and <i>defined</i>. If the result
is not an <tref>absolute IRI</tref>, i.e., it contains no
colon (<code>:</code>), an
@@ -1109,8 +1109,8 @@
<li>Otherwise, set the <tref>IRI mapping</tref> of <i>definition</i> to the
result of using the <a href="#iri-expansion">IRI Expansion algorithm</a>, passing
<tref>active context</tref>, the value associated with the <code>@id</code> key for
- <i>value</i>, <tref>true</tref> for <i>vocabRelative</i>,
- <tref>true</tref> for <i>documentRelative</i>,
+ <i>value</i>, <tref>true</tref> for <i>vocab</i>,
+ <tref>true</tref> for <i>document relative</i>,
<tref>local context</tref>, and <i>defined</i>.</li>
</ol>
</li>
@@ -1147,8 +1147,8 @@
<li>Set <i>type</i> to the result of using the
<a href="#iri-expansion">IRI Expansion algorithm</a>, passing
<tref>active context</tref>, <i>type</i> for <i>value</i>,
- <tref>true</tref> for <i>vocabRelative</i>,
- <tref>true</tref> for <i>documentRelative</i>,
+ <tref>true</tref> for <i>vocab</i>,
+ <tref>true</tref> for <i>document relative</i>,
<tref>local context</tref>, and <i>defined</i>. If the expanded <i>type</i> is
neither <code>@id</code>, nor <code>@vocab</code>, nor an <tref>absolute IRI</tref>, an
<code class="error"><a href="#idl-def-JsonLdErrorCode.invalid-type-mapping">invalid type mapping</a></code>
@@ -1239,7 +1239,7 @@
<p>The algorithm takes two required and four optional input variables. The
required inputs are an <tref>active context</tref> and a <i>value</i>
to be expanded. The optional inputs are two flags,
- <i>documentRelative</i> and <i>vocabRelative</i>, that specifying
+ <i>document relative</i> and <i>vocab</i>, that specifying
whether <i>value</i> can be interpreted as a <tref>relative IRI</tref>
against the document's base <tref>IRI</tref> or the
<tref title="active context">active context's</tref>
@@ -1261,7 +1261,7 @@
a <tref>term definition</tref> is created for <i>value</i> in
<tref>active context</tref> during <a href="#context-processing-algorithm">Context Processing</a>.
</li>
- <li>If <i>vocabRelative</i> is <tref>true</tref> and the
+ <li>If <i>vocab</i> is <tref>true</tref> and the
<tref>active context</tref> has a <tref>term definition</tref> for
<i>value</i>, return the associated <tref>IRI mapping</tref>.</li>
<li>Otherwise, if <i>value</i> contains a colon (<code>:</code>),
@@ -1294,11 +1294,11 @@
</li>
<li>Otherwise, if <i>value</i> does not contain a colon (<code>:</code>):
<ol class="algorithm">
- <li>If <i>vocabRelative</i> is <tref>true</tref>, and
+ <li>If <i>vocab</i> is <tref>true</tref>, and
<tref>active context</tref> has a <tref>vocabulary mapping</tref>,
return the result of concatenating the <tref>vocabulary mapping</tref>
with <i>value</i>.</li>
- <li>Otherwise, if <i>documentRelative</i> is <tref>true</tref>,
+ <li>Otherwise, if <i>document relative</i> is <tref>true</tref>,
return the result of resolving <i>value</i> against
the <tref>base IRI</tref>. Only the basic algorithm in
<cite><a href="http://tools.ietf.org/html/rfc3986#section-5.2">section 5.2</a></cite>
@@ -1431,7 +1431,7 @@
<li>Set <i>expanded property</i> to the result of
using the <a href="#iri-expansion">IRI Expansion algorithm</a>,
passing <tref>active context</tref>, <i>key</i> for
- <i>value</i>, and <tref>true</tref> for <i>vocabRelative</i>.</li>
+ <i>value</i>, and <tref>true</tref> for <i>vocab</i>.</li>
<li>If <i>expanded property</i> is <tref>null</tref> or it neither
contains a colon (<code>:</code>) nor it is a <tref>keyword</tref>,
drop <i>key</i> by continuing to the next <i>key</i>.</li>
@@ -1450,7 +1450,7 @@
set <i>expanded value</i> to the result of using the
<a href="#iri-expansion">IRI Expansion algorithm</a>,
passing <tref>active context</tref>, <i>value</i>, and <tref>true</tref>
- for <i>documentRelative</i>.</li>
+ for <i>document relative</i>.</li>
<li>If <i>expanded property</i> is <code>@type</code> and <i>value</i>
is neither a <tref>string</tref> nor an <tref>array</tref> of
<tref title="string">strings</tref>, an
@@ -1458,8 +1458,8 @@
error has been detected and processing is aborted. Otherwise,
set <i>expanded value</i> to the result of using the
<a href="#iri-expansion">IRI Expansion algorithm</a>, passing
- <tref>active context</tref>, <tref>true</tref> for <i>vocabRelative</i>,
- and <tref>true</tref> for <i>documentRelative</i> to expand the <i>value</i>
+ <tref>active context</tref>, <tref>true</tref> for <i>vocab</i>,
+ and <tref>true</tref> for <i>document relative</i> to expand the <i>value</i>
or each of its items.</li>
<li>If <i>expanded property</i> is <code>@graph</code>, set
<i>expanded value</i> to the result of using this algorithm
@@ -1767,15 +1767,15 @@
key is <code>@id</code> and the value is the result of using the
<a href="#iri-expansion">IRI Expansion algorithm</a>, passing
<tref>active context</tref>, <i>value</i>, and <tref>true</tref> for
- <i>documentRelative</i>.</li>
+ <i>document relative</i>.</li>
<li>If <tref>active property</tref> has a <tref>type mapping</tref> in
<tref>active context</tref> that is <code>@vocab</code>, return
a new <tref>JSON object</tref> containing a single key-value pair
where the key is <code>@id</code> and the value is the result of
using the <a href="#iri-expansion">IRI Expansion algorithm</a>, passing
<tref>active context</tref>, <i>value</i>, <tref>true</tref> for
- <i>vocabRelative</i>, and <tref>true</tref> for
- <i>documentRelative</i>.</li>
+ <i>vocab</i>, and <tref>true</tref> for
+ <i>document relative</i>.</li>
<li>Otherwise, initialize <i>result</i> to a <tref>JSON object</tref>
with an <code>@value</code> member whose value is set to
<i>value</i>.</li>
@@ -1926,7 +1926,7 @@
of using the <a href="#iri-compaction">IRI Compaction algorithm</a>,
passing <tref>active context</tref>, <tref>inverse context</tref>,
<i>expanded value</i> for <i>iri</i>,
- and <tref>true</tref> for <i>vocabRelative</i> if
+ and <tref>true</tref> for <i>vocab</i> if
<i>expanded property</i> is <code>@type</code>,
<tref>false</tref> otherwise.</li>
<li>Otherwise, <i>expanded value</i> must be a
@@ -1939,7 +1939,7 @@
of using the <a href="#iri-compaction">IRI Compaction algorithm</a>,
passing <tref>active context</tref>, <tref>inverse context</tref>,
<i>expanded type</i> for <i>iri</i>, and
- <tref>true</tref> for <i>vocabRelative</i>,
+ <tref>true</tref> for <i>vocab</i>,
to <i>compacted value</i>.</li>
<li>If <i>compacted value</i> contains only one
item (it has a length of <code>1</code>), then
@@ -2025,7 +2025,7 @@
passing <tref>active context</tref>, <tref>inverse context</tref>,
<i>expanded property</i> for <i>iri</i>,
<i>expanded value</i> for <i>value</i>,
- <tref>true</tref> for <i>vocabRelative</i>, and
+ <tref>true</tref> for <i>vocab</i>, and
<i>inside reverse</i>.</li>
<li>If <i>result</i> does not have the key that equals
<i>item active property</i>, set this key's value in
@@ -2045,7 +2045,7 @@
passing <tref>active context</tref>, <tref>inverse context</tref>,
<i>expanded property</i> for <i>iri</i>,
<i>expanded item</i> for <i>value</i>,
- <tref>true</tref> for <i>vocabRelative</i>, and
+ <tref>true</tref> for <i>vocab</i>, and
<i>inside reverse</i>.</li>
<li>Initialize <i>container</i> to <tref>null</tref>. If there
is a <tref>container mapping</tref> for
@@ -2216,9 +2216,9 @@
<ol class="algorithm">
<li>Initialize <i>result</i> to an empty <tref>JSON object</tref>.</li>
- <li>Initialize <i>defaultLanguage</i> to <code>@none</code>. If the
+ <li>Initialize <i>default language</i> to <code>@none</code>. If the
<tref>active context</tref> has a <tref>default language</tref>,
- set <i>defaultLanguage</i> to it.</li>
+ set <i>default language</i> to it.</li>
<li>For each key <tref>term</tref> and value <tref>term definition</tref> in
the <tref>active context</tref>, ordered by shortest <tref>term</tref>
first (breaking ties by choosing the lexicographically least
@@ -2245,12 +2245,12 @@
<tref>JSON object</tref>, the second member is <code>@type</code>
and its value is a new empty <tref>JSON object</tref>.</li>
<li>Reference the value associated with the <i>container</i> member
- in <i>container map</i> using the variable <i>typeOrLanguage map</i>.</li>
+ in <i>container map</i> using the variable <i>type/language map</i>.</li>
<li>If the <tref>term definition</tref> indicates that the <tref>term</tref>
represents a <tref>reverse property</tref>:
<ol class="algorithm">
<li>Reference the value associated with the <code>@type</code>
- member in <i>typeOrLanguage map</i> using the variable
+ member in <i>type/language map</i> using the variable
<i>type map</i>.</li>
<li>If <i>type map</i> does not have a <code>@reverse</code>
member, create one and set its value to the <tref>term</tref>
@@ -2261,7 +2261,7 @@
<tref>type mapping</tref>:
<ol class="algorithm">
<li>Reference the value associated with the <code>@type</code>
- member in <i>typeOrLanguage map</i> using the variable
+ member in <i>type/language map</i> using the variable
<i>type map</i>.</li>
<li>If <i>type map</i> does not have a member corresponding
to the <tref>type mapping</tref> in <tref>term definition</tref>,
@@ -2273,7 +2273,7 @@
<tref>language mapping</tref> (might be <tref>null</tref>):
<ol class="algorithm">
<li>Reference the value associated with the <code>@language</code>
- member in <i>typeOrLanguage map</i> using the variable
+ member in <i>type/language map</i> using the variable
<i>language map</i>.</li>
<li>If the <tref>language mapping</tref> equals <tref>null</tref>,
set <i>language</i> to <code>@null</code>; otherwise set it
@@ -2286,16 +2286,16 @@
<li>Otherwise:
<ol class="algorithm">
<li>Reference the value associated with the <code>@language</code>
- member in <i>typeOrLanguage map</i> using the variable
+ member in <i>type/language map</i> using the variable
<i>language map</i>.</li>
- <li>If <i>language map</i> does not have a <i>defaultLanguage</i>
+ <li>If <i>language map</i> does not have a <i>default language</i>
member, create one and set its value to the <tref>term</tref>
being processed.</li>
<li>If <i>language map</i> does not have a <code>@none</code>
member, create one and set its value to the <tref>term</tref>
being processed.</li>
<li>Reference the value associated with the <code>@type</code>
- member in <i>typeOrLanguage map</i> using the variable
+ member in <i>type/language map</i> using the variable
<i>type map</i>.</li>
<li>If <i>type map</i> does not have a <code>@none</code>
member, create one and set its value to the <tref>term</tref>
@@ -2356,20 +2356,20 @@
<p>This algorithm takes three required inputs and three optional inputs.
The required inputs an <tref>active context</tref>, an <tref>inverse context</tref>,
and the <i>iri</i> to be compacted. The optional inputs are a <i>value</i> associated
- with the <i>iri</i>, a <i>vocabRelative</i> flag which specifies whether the
+ with the <i>iri</i>, a <i>vocab</i> flag which specifies whether the
passed <i>iri</i> should be compacted using the
<tref title="active context">active context's</tref>
<tref>vocabulary mapping</tref>, and a <i>reverse</i> flag which specifies whether
a <tref>reverse property</tref> is being compacted. If not passed, <i>value</i> is set to
- <tref>null</tref> and <i>vocabRelative</i> and <i>reverse</i> are both set to
+ <tref>null</tref> and <i>vocab</i> and <i>reverse</i> are both set to
<code>false</code>.</p>
<ol class="algorithm">
<li>If <i>iri</i> is <tref>null</tref>, return <tref>null</tref>.</li>
- <li>If <i>vocabRelative</i> is <tref>true</tref> and <i>iri</i> is a
+ <li>If <i>vocab</i> is <tref>true</tref> and <i>iri</i> is a
key in <tref>inverse context</tref>:
<ol class="algorithm">
- <li>Initialize <i>defaultLanguage</i> to
+ <li>Initialize <i>default language</i> to
<tref title="active context">active context's</tref>
<tref>default language</tref>, if it has one, otherwise to
<code>@none</code>.</li>
@@ -2378,19 +2378,19 @@
preferred <tref title="container mapping">container mappings</tref>
for a <tref>term</tref>, based on what is compatible with
<i>value</i>.</li>
- <li>Initialize <i>typeOrLanguage</i> to <code>@language</code>,
- and <i>typeOrLanguageValue</i> to <code>@null</code>. These two
+ <li>Initialize <i>type/language</i> to <code>@language</code>,
+ and <i>type/language value</i> to <code>@null</code>. These two
variables will keep track of the preferred
<tref>type mapping</tref> or <tref>language mapping</tref> for
a <tref>term</tref>, based on what is compatible with <i>value</i>.</li>
<li>If <i>value</i> is a <tref>JSON object</tref> that contains the
key <code>@index</code>, then append the value <code>@index</code>
to <i>containers</i>.</li>
- <li>If <i>reverse</i> is <tref>true</tref>, set <i>typeOrLanguage</i>
- to <code>@type</code>, <i>typeOrLanguageValue</i> to
+ <li>If <i>reverse</i> is <tref>true</tref>, set <i>type/language</i>
+ to <code>@type</code>, <i>type/language value</i> to
<code>@reverse</code>, and append <code>@set</code> to <i>containers</i>.</li>
<li>Otherwise, if <i>value</i> is a <tref>list object</tref>, then set
- <i>typeOrLanguage</i> and <i>typeOrLanguageValue</i>
+ <i>type/language</i> and <i>type/language value</i>
to the most specific values that work for all items in
the list as follows:
<ol class="algorithm">
@@ -2398,55 +2398,55 @@
append <code>@list</code> to <i>containers</i>.</li>
<li>Initialize <i>list</i> to the <tref>array</tref> associated
with the key <code>@list</code> in <i>value</i>.</li>
- <li>Initialize <i>commonLanguage</i> to <tref>null</tref>. If
- <i>list</i> is empty, set <i>commonLanguage</i> to
- <i>defaultLanguage</i>.</li>
+ <li>Initialize <i>common language</i> to <tref>null</tref>. If
+ <i>list</i> is empty, set <i>common language</i> to
+ <i>default language</i>.</li>
<li>For each <i>item</i> in <i>list</i>:
<ol class="algorithm">
- <li>Initialize <i>itemLanguage</i> to <code>@none</code> and
- <i>itemType</i> to <code>@none</code>.</li>
+ <li>Initialize <i>item language</i> to <code>@none</code> and
+ <i>item type</i> to <code>@none</code>.</li>
<li>If <i>item</i> contains the key <code>@value</code>:
<ol class="algorithm">
<li>If <i>item</i> contains the key <code>@language</code>,
- then set <i>itemLanguage</i> to its associated
+ then set <i>item language</i> to its associated
value.</li>
<li>Otherwise, if <i>item</i> contains the key
- <code>@type</code>, set <i>itemType</i> to its
+ <code>@type</code>, set <i>item type</i> to its
associated value.</li>
- <li>Otherwise, set <i>itemLanguage</i> to
+ <li>Otherwise, set <i>item language</i> to
<code>@null</code>.</li>
</ol>
</li>
- <li>Otherwise, set <i>itemType</i> to <code>@id</code>.</li>
- <li>If <i>commonLanguage</i> is <tref>null</tref>, set it
- to <i>itemLanguage</i>.</li>
- <li>Otherwise, if <i>itemLanguage</i> does not equal
- <i>commonLanguage</i> and <i>item</i> contains the
- key <code>@value</code>, then set <i>commonLanguage</i>
+ <li>Otherwise, set <i>item type</i> to <code>@id</code>.</li>
+ <li>If <i>common language</i> is <tref>null</tref>, set it
+ to <i>item language</i>.</li>
+ <li>Otherwise, if <i>item language</i> does not equal
+ <i>common language</i> and <i>item</i> contains the
+ key <code>@value</code>, then set <i>common language</i>
to <code>@none</code> because list items have conflicting
languages.</li>
- <li>If <i>commonType</i> is <tref>null</tref>, set it
- to <i>itemType</i>.</li>
- <li>Otherwise, if <i>itemType</i> does not equal
- <i>commonType</i>, then set <i>commonType</i>
+ <li>If <i>common type</i> is <tref>null</tref>, set it
+ to <i>item type</i>.</li>
+ <li>Otherwise, if <i>item type</i> does not equal
+ <i>common type</i>, then set <i>common type</i>
to <code>@none</code> because list items have conflicting
types.</li>
- <li>If <i>commonLanguage</i> is <code>@none</code> and
- <i>commonType</i> is <code>@none</code>, then
+ <li>If <i>common language</i> is <code>@none</code> and
+ <i>common type</i> is <code>@none</code>, then
stop processing items in the list because it has been
detected that there is no common language or type amongst
the items.</li>
</ol>
</li>
- <li>If <i>commonLanguage</i> is <tref>null</tref>, set it to
- <code>@none</code>.</li>
- <li>If <i>commonType</i> is <tref>null</tref>, set it to
+ <li>If <i>common language</i> is <tref>null</tref>, set it to
<code>@none</code>.</li>
- <li>If <i>commonType</i> is not <code>@none</code> then set
- <i>typeOrLanguage</i> to <code>@type</code> and
- <i>typeOrLanguageValue</i> to <i>commonType</i>.</li>
- <li>Otherwise, set <i>typeOrLanguageValue</i> to
- <i>commonLanguage</i>.</li>
+ <li>If <i>common type</i> is <tref>null</tref>, set it to
+ <code>@none</code>.</li>
+ <li>If <i>common type</i> is not <code>@none</code> then set
+ <i>type/language</i> to <code>@type</code> and
+ <i>type/language value</i> to <i>common type</i>.</li>
+ <li>Otherwise, set <i>type/language value</i> to
+ <i>common language</i>.</li>
</ol>
</li>
<li>Otherwise:
@@ -2455,17 +2455,17 @@
<ol class="algorithm">
<li>If <i>value</i> contains the key <code>@language</code>
and does not contain the key <code>@index</code>,
- then set <i>typeOrLanguageValue</i> to its associated
+ then set <i>type/language value</i> to its associated
value and append <code>@language</code> to
<i>containers</i>.</li>
<li>Otherwise, if <i>value</i> contains the key
- <code>@type</code>, then set <i>typeOrLanguageValue</i> to
- its associated value and set <i>typeOrLanguage</i> to
+ <code>@type</code>, then set <i>type/language value</i> to
+ its associated value and set <i>type/language</i> to
<code>@type</code>.</li>
</ol>
</li>
- <li>Otherwise, set <i>typeOrLanguage</i> to <code>@type</code>
- and set <i>typeOrLanguageValue</i> to <code>@id</code>.</li>
+ <li>Otherwise, set <i>type/language</i> to <code>@type</code>
+ and set <i>type/language value</i> to <code>@id</code>.</li>
<li>Append <code>@set</code> to <i>containers</i>.</li>
</ol>
</li>
@@ -2473,24 +2473,24 @@
the non-existence of a <tref>container mapping</tref>, and it will
be the last <tref>container mapping</tref> value to be checked as it
is the most generic.</li>
- <li>If <i>typeOrLanguageValue</i> is <tref>null</tref>, set it to
+ <li>If <i>type/language value</i> is <tref>null</tref>, set it to
<code>@null</code>. This is the key under which <tref>null</tref> values
are stored in the <tref>inverse context</tref> <i>entry</i>.</li>
<li>Initialize <i>preferred values</i> to an empty <tref>array</tref>.
This <tref>array</tref> will indicate, in order, the preferred values for
a <tref title="term">term's</tref> <tref>type mapping</tref> or
<tref>language mapping</tref>.</li>
- <li>If <i>typeOrLanguageValue</i> is <code>@reverse</code>, append
+ <li>If <i>type/language value</i> is <code>@reverse</code>, append
<code>@reverse</code> to <i>preferred values</i>.</li>
- <li>If <i>typeOrLanguageValue</i> is <code>@id</code> or <code>@reverse</code>
+ <li>If <i>type/language value</i> is <code>@id</code> or <code>@reverse</code>
and <i>value</i> has an <code>@id</code> member:
<ol class="algorithm">
<li>If the result of using the
<a href="#iri-compaction">IRI compaction algorithm</a>,
passing <tref>active context</tref>, <tref>inverse context</tref>,
the value associated with the <code>@id</code> key in <i>value</i> for
- <i>iri</i>, <tref>true</tref> for <i>vocabRelative</i>, and
- <tref>true</tref> for <i>documentRelative</i> has a
+ <i>iri</i>, <tref>true</tref> for <i>vocab</i>, and
+ <tref>true</tref> for <i>document relative</i> has a
<tref>term definition</tref> in the <tref>active context</tref>
with an <tref>IRI mapping</tref> that equals the value associated
with the <code>@id</code> key in <i>value</i>,
@@ -2500,12 +2500,12 @@
<code>@none</code>, in that order, to <i>preferred values</i>.</li>
</ol>
</li>
- <li>Otherwise, append <i>typeOrLanguageValue</i> and <code>@none</code>, in
+ <li>Otherwise, append <i>type/language value</i> and <code>@none</code>, in
that order, to <i>preferred values</i>.</li>
<li>Initialize <i>term</i> to the result of the
<a href="#term-selection">Term Selection algorithm</a>, passing
<tref>inverse context</tref>, <i>iri</i>, <i>containers</i>,
- <i>typeOrLanguage</i>, and <i>preferred values</i>.</li>
+ <i>type/language</i>, and <i>preferred values</i>.</li>
<li>If <i>term</i> is not <tref>null</tref>, return <i>term</i>.</li>
</ol>
</li>
@@ -2543,7 +2543,7 @@
</li>
<li>If <i>compact IRI</i> is not <tref>null</tref>, return <i>compact IRI</i>.</li>
<li>At this point, there is no <tref>compact IRI</tref> that <i>iri</i>
- can be compacted to, so if <i>vocabRelative</i> is
+ can be compacted to, so if <i>vocab</i> is
<tref>true</tref> and <tref>active context</tref> has a
<tref>vocabulary mapping</tref>:
<ol class="algorithm">
@@ -2555,7 +2555,7 @@
then return <i>suffix</i>.</li>
</ol>
</li>
- <li>If <i>vocabRelative</i> is <tref>false</tref> then
+ <li>If <i>vocab</i> is <tref>false</tref> then
transform <i>iri</i> to a <tref>relative IRI</tref> using
the document's base <tref>IRI</tref>.</li>
<li>Finally, return <i>iri</i> as is.</li>
@@ -2608,7 +2608,7 @@
an <tref>inverse context</tref>, a <tref>keyword</tref> or <tref>IRI</tref>
<i>iri</i>, an <tref>array</tref> <i>containers</i> that represents an
ordered list of preferred <tref title="container mapping">container mappings</tref>,
- a <tref>string</tref> <i>typeOrLanguage</i> that indicates whether
+ a <tref>string</tref> <i>type/language</i> that indicates whether
to look for a <tref>term</tref> with a matching <tref>type mapping</tref>
or <tref>language mapping</tref>, and an <tref>array</tref> representing
an ordered list of <i>preferred values</i> for the <tref>type mapping</tref>
@@ -2623,19 +2623,19 @@
there is no <tref>term</tref> with a matching
<tref>container mapping</tref> for it, so continue to the next
<i>container</i>.</li>
- <li>Initialize <i>typeOrLanguage map</i> to the value associated
+ <li>Initialize <i>type/language map</i> to the value associated
with the <i>container</i> member in <i>container map</i>.</li>
- <li>Initialize <i>typeOrLanguageValue map</i> to the value associated
- with <i>typeOrLanguage</i> member in <i>typeOrLanguage map</i>.</li>
+ <li>Initialize <i>value map</i> to the value associated
+ with <i>type/language</i> member in <i>type/language map</i>.</li>
<li>For each <i>item</i> in <i>preferred values</i>:
<ol class="algorithm">
- <li>If <i>item</i> is not a key in <i>typeOrLanguageValue map</i>,
+ <li>If <i>item</i> is not a key in <i>value map</i>,
then there is no <tref>term</tref> with a matching
<tref>type mapping</tref> or <tref>language mapping</tref>,
so continue to the next <i>item</i>.</li>
<li>Otherwise, a matching term has been found, return the value
associated with the <i>item</i> member in
- <i>typeOrLanguageValue map</i>.</li>
+ <i>value map</i>.</li>
</ol>
</li>
</ol>
@@ -2716,7 +2716,7 @@
<a href="#iri-compaction">IRI compaction algorithm</a>,
passing <tref>active context</tref>, <tref>inverse context</tref>,
the value of the <code>@id</code> member for <i>iri</i>, and
- <tref>true</tref> for <i>vocabRelative</i>.</li>
+ <tref>true</tref> for <i>vocab</i>.</li>
<li>Otherwise, return <i>value</i> as is.</li>
</ol>
</li>