--- a/spec/latest/json-ld-api/index.html Thu Aug 30 12:47:48 2012 +0200
+++ b/spec/latest/json-ld-api/index.html Thu Aug 30 15:06:21 2012 +0200
@@ -841,10 +841,10 @@
</dd>
<dt>void fromRDF()</dt>
- <dd>Creates a JSON-LD document given an set of <ldtref title="quad">Quads</ldtref>.
+ <dd>Creates a JSON-LD document given an set of <ldtref title="Quad">Quads</ldtref>.
<dl class="parameters">
<dt>Quad[] input</dt>
- <dd>A <tref>dataset</tref> represented as an array of <ldtref title="quad">Quads</ldtref>.</dd>
+ <dd>A <tref>dataset</tref> represented as an array of <ldtref title="Quad">Quads</ldtref>.</dd>
<dt>JsonLdCallback callback</dt>
<dd>A callback that is called when processing is complete on
the given <code>input</code>.</dd>
@@ -1061,9 +1061,8 @@
values will often be generated differently by different processors.</p>
<p class="note">Implementers MUST ensure that <a>BlankNode</a> values are unique
- within the current environment, two <ldtref
- title="blanknode">BlankNodes</ldtref> are considered equal if, and only
- if, their values are strictly equal.</p>
+ within the current environment, two <ldtref title="BlankNode">BlankNodes</ldtref>
+ are considered equal if, and only if, their values are strictly equal.</p>
</section>
<section>
@@ -1176,15 +1175,15 @@
is typically used along with a <em>suffix</em> to form a <tref>compact IRI</tref> to create an IRI
within a vocabulary.
</dd>
- <dt><tdef>language-tagged literal</tdef></dt><dd>
- A <tref>language-tagged literal</tref> is a <tref>literal</tref> without a datatype, including
- a language.
- See <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-language-tagged-literal">languaged-tagged literal</a></cite> in [[!RDF-CONCEPTS]].
+ <dt><tdef>language-tagged string</tdef></dt><dd>
+ A <tref>language-tagged string</tref> is a <tref>literal</tref> without a datatype, including
+ a language. See <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-language-tagged-string">languaged-tagged string</a></cite>
+ in [[!RDF-CONCEPTS]].
</dd>
<dt><tdef>typed literal</tdef></dt><dd>
A <tref>typed literal</tref> is a <tref>literal</tref> with an associated <tref>IRI</tref>
- which indicates the literal's datatype.
- See <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-typed-literal">languaged-tagged literal</a></cite> in [[!RDF-CONCEPTS]].
+ which indicates the literal's datatype. See <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-literal">literal</a></cite>
+ in [[!RDF-CONCEPTS]].
</dd>
</dl>
</section>
@@ -2070,9 +2069,10 @@
similar to Turtle's <code>blankNodePropertyList</code>.</p>
<p>After expansion, JSON-LD <tref title="number">numbers</tref>,
- <tref title="true">booleans</tref>, typed- and language-tagged-<tref
- title="literal">literals</tref>, and <tref title="iri">IRIs</tref>
- become explicit, and can be directly transformed into their RDF representations.</p>
+ <tref title="true">booleans</tref>, <tref title="typed literal">typed literals</tref>,
+ <tref title="language-tagged string">language-tagged-strings</tref>,
+ and <tref title="iri">IRIs</tref> become explicit, and can be directly
+ transformed into their RDF representations.</p>
<pre class="example" data-transform="updateExample">
<!--
@@ -2156,7 +2156,7 @@
</li>
<li>
Otherwise, if <em>element</em> contains a <code>@language</code> property, set the
- <tref>active object</tref> to a <tref>language-tagged literal</tref>.
+ <tref>active object</tref> to a <tref>language-tagged string</tref>.
</li>
<li>
Otherwise, set the <tref>active object</tref> to a <tref>typed literal</tref>
@@ -2269,7 +2269,7 @@
<h2>Convert from RDF Algorithm</h2>
<p>In some cases, data exists natively in Triples or Quads form; for example, if the data was originally
represented in an RDF graph or triple/quad store. This algorithm is designed to simply translate
- an array of <ldtref title="quad">Quads</ldtref> into a JSON-LD document.</p>
+ an array of <ldtref title="Quad">Quads</ldtref> into a JSON-LD document.</p>
<p>When expanding <tref>typed literal</tref> values having a datatype of <code>xsd:string</code>,
the <code>@type</code> MUST NOT be set to <code>xsd:string</code> and the resulting value
MUST have only a <code>@value</code> property.</p>
--- a/spec/latest/json-ld-framing/index.html Thu Aug 30 12:47:48 2012 +0200
+++ b/spec/latest/json-ld-framing/index.html Thu Aug 30 15:06:21 2012 +0200
@@ -594,10 +594,10 @@
is typically used along with a <em>suffix</em> to form a <tref>compact IRI</tref> to create an IRI
within a vocabulary.
</dd>
- <dt><tdef>language-tagged literal</tdef></dt><dd>
- A <tref>language-tagged literal</tref> is a <tref>literal</tref> without a datatype, including
- a language.
- See <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-language-tagged-literal">languaged-tagged literal</a></cite> in [[!RDF-CONCEPTS]].
+ <dt><tdef>language-tagged string</tdef></dt><dd>
+ A <tref>language-tagged string</tref> is a <tref>literal</tref> without a datatype, including
+ a language. See <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-language-tagged-string">languaged-tagged string</a></cite>
+ in [[!RDF-CONCEPTS]].
</dd>
<dt><tdef>typed literal</tdef></dt><dd>
A <tref>typed literal</tref> is a <tref>literal</tref> with an associated <tref>IRI</tref>
--- a/spec/latest/json-ld-syntax/index.html Thu Aug 30 12:47:48 2012 +0200
+++ b/spec/latest/json-ld-syntax/index.html Thu Aug 30 15:06:21 2012 +0200
@@ -1507,13 +1507,12 @@
</section>
<section>
-<h2>Language-tagged Values</h2>
+<h2>Language-tagged Strings</h2>
<p>
- A value with an associated language, also known as a
- <tdef>language-tagged value</tdef>, is indicated by associating a value with
- an <tref>string</tref> having the lexical from defined in [[!BCP47]]
- which indicates the value's language. Language-tagged values may be
+ A string with an associated language, also known as a
+ <tdef>language-tagged string</tdef>, is indicated by associating a string with
+ an language code as defined in [[!BCP47]]. Language-tagged strings may be
expressed in JSON-LD in four ways:
</p>
@@ -2771,7 +2770,7 @@
<li><tref>node reference</tref>,</li>
<li><tref>node definition</tref>,</li>
<li><tref>typed value</tref>,</li>
- <li><tref>language-tagged value</tref>,</li>
+ <li><tref>language-tagged string</tref>,</li>
<li><code>@set</code> or <code>@list</code>
definition (see <a href="#sets-and-lists"></a>),</li>
<li>an <tref>array</tref> zero or more of these, or</li>
@@ -2830,7 +2829,7 @@
<li><tref>node reference</tref>,</li>
<li><tref>node definition</tref>,</li>
<li><tref>typed value</tref>,</li>
- <li><tref>language-tagged value</tref>,</li>
+ <li><tref>language-tagged string</tref>,</li>
<li><code>@set</code> or <code>@list</code>
definition (see <a href="#sets-and-lists"></a>), or</li>
<li>an <tref>array</tref> zero or more of these</li>
@@ -2883,7 +2882,7 @@
MUST NOT contain any other key except <code>@value</code>. The value of
<code>@type</code> MUST be a <tref>term</tref>, <tref>compact IRI</tref>,
<tref>absolute IRI</tref>, or <code>null</code>.</p>
-<p>See <a href="#typed-values"></a> and <a href="#language-tagged-values"></a>
+<p>See <a href="#typed-values"></a> and <a href="#language-tagged-strings"></a>
for a further discussion of
<tref title="expanded value">expanded values</tref>.</p>
</section>
@@ -2898,7 +2897,7 @@
<li><tref>node reference</tref>,</li>
<li><tref>node definition</tref>,</li>
<li><tref>typed value</tref>, or</li>
- <li><tref>language-tagged value</tref>.</li>
+ <li><tref>language-tagged string</tref>.</li>
</ul>
<p>A <tdef>set</tdef> is a <tref>JSON object</tref> having only the <code>@set</code>
<tref>keyword</tref>. Its value MUST be an <tref>array</tref> of any of the following:</p>
@@ -2907,7 +2906,7 @@
<li><tref>node reference</tref>,</li>
<li><tref>node definition</tref>,</li>
<li><tref>typed value</tref>,</li>
- <li><tref>language-tagged value</tref>,</li>
+ <li><tref>language-tagged string</tref>,</li>
<li><code>@set</code> or <code>@list</code>
definition (see <a href="#sets-and-lists"></a>), or</li>
<li>an <tref>array</tref> zero or more of these.</li>