--- a/spec/latest/json-ld-api/index.html Fri Apr 27 16:22:09 2012 -0400
+++ b/spec/latest/json-ld-api/index.html Fri Apr 27 16:22:34 2012 -0400
@@ -406,7 +406,7 @@
</dd>
<dt><tdef>subject definition</tdef></dt><dd>
A <tref>JSON object</tref> used to represent a <tref>subject</tref> and one or more properties
- of that subject. A <tref>JSON object</tref> is a subject definition if it does not contain they keys
+ of that subject. A <tref>JSON object</tref> is a subject definition if it does not contain the keys
<code>@value</code>, <code>@list</code> or <code>@set</code> and it has one or more keys other than <code>@id</code>.</dd>
<dt><tdef>subject reference</tdef></dt><dd>
A <tref>JSON object</tref> used to reference a subject having only the <code>@id</code> key.</dd>
@@ -633,9 +633,6 @@
<dt>object or object[] or URL input</dt>
<dd>The JSON-LD object or array of JSON-LD objects to convert to RDF or an <tref>IRI</tref>
referencing the JSON-LD document to convert to RDF.</dd>
- <dt>ObjectOrURL? context</dt>
- <dd>An external context to use additionally to the context embedded in
- <code>input</code> when expanding the <code>input</code>.</dd>
<dt>StatementCallback callback</dt>
<dd>A callback that is called when a <a>Statement</a> is created from processing
the given <code>input</code>.</dd>
@@ -1034,7 +1031,7 @@
<code>@container</code> with <code>@set</code>.
</div>
</li>
- <li>If the <em>property</em> has the form of <tref>term</tref>, it's <em>value</em> MUST have an
+ <li>If the <em>property</em> has the form of <tref>term</tref>, its <em>value</em> MUST have an
<code>@id</code> property with a string value which MUST have the form of a <tref>term</tref>,
<tref>compact IRI</tref>, or <tref>absolute IRI</tref>. Determine the IRI mapping
by performing <a href="#iri-expansion">IRI Expansion</a> on the associated value.
@@ -1046,12 +1043,12 @@
Determine the IRI mapping by performing <a href="#iri-expansion">IRI Expansion</a> on the associated
value. If the result of the IRI mapping is an <tref>absolute IRI</tref>, merge the
<em>property</em> into the <tref>local context</tref> <tref>term mapping</tref>.</li>
- <li>If the <em>value</em> has a <code>@type</code> property, it's value MUST have the form of a <tref>term</tref>,
+ <li>If the <em>value</em> has a <code>@type</code> property, its value MUST have the form of a <tref>term</tref>,
<tref>compact IRI</tref>, <tref>absolute IRI</tref>, 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 <tref>absolute IRI</tref> or <code>@id</code>, merge into the
<tref>local context</tref> <tref>coercion mapping</tref> using the lexical value of the <em>property</em>.</li>
- <li>If the <em>value</em> has a <code>@container</code> property, it's value MUST be <code>@list</code> or
+ <li>If the <em>value</em> has a <code>@container</code> property, its value MUST be <code>@list</code> or
<code>@set</code>. Merge the <tref>list mapping</tref> or <tref>set mapping</tref> into the
<tref>local context</tref> using the lexical value of the <em>property</em>.</li>
<li>If the <em>value</em> has a <code>@language</code> property but no <code>@type</code> property, the value of the
@@ -1379,7 +1376,7 @@
If has a <code>@container</code> set to <code>@list</code> and any entry in <em>element</em> is an
<tref>array</tref>, or is a <tref>JSON object</tref> containing a <code>@list</code> property,
throw an exception, as lists of lists are not allowed.
- If the expanded entry is null, drop it. If it's an array, merge it's entries with <em>element</em>'s entries.</li>
+ If the expanded entry is null, drop it. If it's an array, merge its entries with <em>element</em>'s entries.</li>
<li>Otherwise, if <em>element</em> is an object
<ol class="algorithm">
<li>If <em>element</em> has a <code>@context</code> property, update the <tref>active context</tref> according to
@@ -1406,7 +1403,7 @@
<a href="#framing">Framing</a>).</li>
<li>Otherwise, if <em>value</em> is an <tref>array</tref>, all elements must be either a
<tref>string</tref> or <tref>subject reference</tref>. Expand <em>value</em> for each
- of it's entries using the previous three steps.</li>
+ of its entries using the previous three steps.</li>
</ol>
</li>
<li>Otherwise, if the <em>property</em> is <code>@value</code> or <code>@language</code> the <em>value</em> MUST NOT be a
@@ -1438,7 +1435,7 @@
<em>element</em> with the value of <code>@value</code>.</li>
</ol>
</li>
- <li>Otherwise, if <em>element</em> has an <code>@type</code> property and it's value is not in the form of an
+ <li>Otherwise, if <em>element</em> has an <code>@type</code> property and its value is not in the form of an
<tref>array</tref>, convert it to an <tref>array</tref>.</li>
<li>If <em>element</em> has an <code>@set</code> or <code>@list</code> property, it MUST be the only property.
Set <em>element</em> to the value of <code>@set</code>; leave <code>@list</code> untouched.</li>
@@ -2127,7 +2124,7 @@
</li>
<li>
Otherwise, as a <tref>plain literal</tref>. If <em>element</em> contains
- a <code>@language</code> property, use it's value to set the language of the plain literal.
+ a <code>@language</code> property, use its value to set the language of the plain literal.
</li>
</ol>
</li>
--- a/spec/latest/json-ld-syntax/index.html Fri Apr 27 16:22:09 2012 -0400
+++ b/spec/latest/json-ld-syntax/index.html Fri Apr 27 16:22:34 2012 -0400
@@ -688,7 +688,7 @@
<p>
The set of contexts defined within a specific <tref>JSON object</tref> are
referred to as <tdef>local context</tdef>s. Setting the context to <code>null</code>
- effectively sets the <tref>local context</tref> to it's initial state. The
+ effectively sets the <tref>local context</tref> to its initial state. The
<tdef>active context</tdef> refers to the accumulation of
<tref>local context</tref>s that are in scope at a specific point within
the document. The following example specifies an external context and then
--- a/test-suite/tests/compact-0007-in.jsonld Fri Apr 27 16:22:09 2012 -0400
+++ b/test-suite/tests/compact-0007-in.jsonld Fri Apr 27 16:22:34 2012 -0400
@@ -18,10 +18,10 @@
"@id": "http://example.org/test#library",
"http://example.org/vocab#contains": [{
"@id": "http://example.org/test#book",
- "http://example.org/vocab#contains": ["http://example.org/test#chapter"],
+ "http://example.org/vocab#contains": [ "this-is-not-an-IRI" ],
"http://purl.org/dc/elements/1.1/contributor": ["Writer"],
"http://purl.org/dc/elements/1.1/title": ["My Book"]
}]
}
]
-}
\ No newline at end of file
+}
--- a/test-suite/tests/compact-0007-out.jsonld Fri Apr 27 16:22:09 2012 -0400
+++ b/test-suite/tests/compact-0007-out.jsonld Fri Apr 27 16:22:34 2012 -0400
@@ -27,8 +27,8 @@
"@id": "http://example.org/test#book",
"dc:contributor": "Writer",
"dc:title": "My Book",
- "http://example.org/vocab#contains": "http://example.org/test#chapter"
+ "http://example.org/vocab#contains": "this-is-not-an-IRI"
}
}
]
-}
\ No newline at end of file
+}