--- a/spec/latest/json-ld-syntax/index.html Mon Dec 05 12:16:54 2011 +0800
+++ b/spec/latest/json-ld-syntax/index.html Wed Dec 07 00:10:56 2011 +0800
@@ -1253,11 +1253,11 @@
</p>
<p>
-In order to use an external context, an author MAY specify an <tref>IRI</tref>
-to a valid JSON-LD document. The referenced document MUST have a
-top-level <tref>JSON Object</tref>. The value of any <code>@context</code> key
-within that object is substituted for the IRI within the referencing document
-to have the same effect as if the value were specified inline within the
+In order to use an external context, an author MAY specify an <tref>IRI</tref>
+to a valid JSON-LD document. The referenced document MUST have a
+top-level <tref>JSON Object</tref>. The value of any <code>@context</code> key
+within that object is substituted for the IRI within the referencing document
+to have the same effect as if the value were specified inline within the
referencing document.</p>
<p>The following example demonstrates the use of an external context:</p>
@@ -1273,17 +1273,17 @@
-->
</pre>
-<p>Authors may also import multiple contexts or a combination of external
+<p>Authors may also import multiple contexts or a combination of external
and local contexts by specifying a list of contexts:</p>
<pre class="example" data-transform="updateExample">
<!--
{
- ****"@context":
- [
- "http://example.org/json-ld-contexts/person",
+ ****"@context":
+ [
+ "http://example.org/json-ld-contexts/person",
{ "foaf": "http://xmlns.com/foaf/0.1/" },
- "http://example.org/json-ld-contexts/event"
+ "http://example.org/json-ld-contexts/event"
]****
"name": "Manu Sporny",
"homepage": "http://manu.sporny.org/",
@@ -1298,27 +1298,27 @@
-->
</pre>
-<p>Each context in a list will be evaluated in-order. Duplicate mappings within
-the <tref>context</tref>s MUST be overwritten on a last-defined-overrides
-basis. The context list MUST contain either de-referenceable <tref>IRI</tref>s
-or <tref>JSON Object</tref>s that conform to the <tref>context</tref> syntax
+<p>Each context in a list will be evaluated in-order. Duplicate mappings within
+the <tref>context</tref>s MUST be overwritten on a last-defined-overrides
+basis. The context list MUST contain either de-referenceable <tref>IRI</tref>s
+or <tref>JSON Object</tref>s that conform to the <tref>context</tref> syntax
as described in this document.</p>
<p>An author may nest contexts within <tref>JSON object</tref>s, with the
more deeply nested contexts overriding the values in previously defined
contexts:</p>
-<pre class="example" data-transform="updateExample">
+<pre class="example" data-transform="updateExample">
<!--
{
- ****"@context":
- {
+ ****"@context":
+ {
"name": "http://example.com/person#name",
"details": "http://example.com/person#details"
},****
"****name****": "Markus",
...
- "details":
+ "details":
{
****"@context": { "name": "http://example.com/organization#name" },****
"****name****": "Acme, Ltd."
@@ -1334,8 +1334,8 @@
<p>External JSON-LD context documents MAY contain extra information located
outside of the <code>@context</code> key, such as
-documentation about the <tref>prefix</tref>es declared in the document.
-When importing a <code>@context</code> value from an external JSON-LD context
+documentation about the <tref>prefix</tref>es declared in the document.
+When importing a <code>@context</code> value from an external JSON-LD context
document, any extra information contained outside of the
<code>@context</code> value MUST be discarded. It is
also RECOMMENDED that a human-readable document encoded in HTML+RDFa
@@ -1435,7 +1435,7 @@
<pre class="example" data-transform="updateExample">
<!--
{
- ****"@context:"
+ ****"@context:"
{
"@language": "ja"
},****
@@ -1448,16 +1448,16 @@
</pre>
<p>The example above would generate a <tref>plain literal</tref> for
-<em>花澄</em> and <em>科学者</em> and associate the <code>ja</code> language
+<em>花澄</em> and <em>科学者</em> and associate the <code>ja</code> language
code with each literal.</p>
-<p>It is possible to override the default language by using the expanded
+<p>It is possible to override the default language by using the expanded
form of a literal:</p>
<pre class="example" data-transform="updateExample">
<!--
{
- "@context:"
+ "@context:"
{
"@language": "ja"
},
@@ -1473,14 +1473,14 @@
-->
</pre>
-<p>It is also possible to override the default language and specify a plain
-literal by omitting the <code>@language</code> tag when expressing the
+<p>It is also possible to override the default language and specify a plain
+literal by omitting the <code>@language</code> tag when expressing the
expanded literal value:</p>
<pre class="example" data-transform="updateExample">
<!--
{
- "@context:"
+ "@context:"
{
"@language": "ja"
},
@@ -1656,11 +1656,11 @@
<code>@iri</code> are to be interpreted as <tref>IRI</tref>s, and are subject to IRI expansion. Specifying
<code>@list</code> indicates that array values of keys coerced as <code>@list</code> are to be serialized
as a <a href="#rdf-collection">List</a>.</p>
-
+
<p>Values within a <code>@coerce</code> definition represent property IRIs and MUST take the form
of <tref>term</tref>, <tref>prefix</tref>:suffix or <tref>array</tref>. Multiple values may be represented using
array form, where each element of the <tref>array</tref> must be a <tref>string</tref> interpreted as <tref>term</tref> or <tref>prefix</tref>:suffix.</p>
-
+
<p>The example below demonstrates how a JSON-LD author can coerce values to
<tref>plain literal</tref>s, <tref>typed literal</tref>s and IRIs.</p>
@@ -2220,14 +2220,11 @@
<dt><code>form</code></dt>
<dd>Determines the serialization form for the JSON-LD document. Valid
values include; <code>compacted</code>, <code>expanded</code>,
- <code>framed</code>, and <code>normalized</code>. Other values are
- allowed, but must be pre-pended with a <code>x-</code> string until
- they are clearly defined by a stable specification. If no form
- is specified in an HTTP request header to a responding application,
- such as a Web server, the application MAY choose any form. If no
- form is specified for a receiving application, the form MUST NOT
- be assumed to take any particular form.</dd>
- <div class="issue">It is currently <a href="https://github.com/json-ld/json-ld.org/issues/14"> being discussed to remove form=framed</a> from this specification as there are several issues with it.</div>
+ and <code>normalized</code>. If no form is specified in an HTTP
+ request header to a responding application, such as a Web server,
+ the application MAY choose any form. If no form is specified for a
+ receiving application, the form MUST NOT be assumed to take any
+ particular form.</dd>
</dl>
</dd>
<dt>Encoding considerations:</dt>