Merge branch 'master' of github.com:json-ld/json-ld.org
authorDave Longley <dlongley@digitalbazaar.com>
Tue, 01 May 2012 16:34:07 -0400
changeset 611 f5082cc1e77e
parent 608 4f59e71052e1 (current diff)
parent 610 494be71d06d2 (diff)
child 612 c2d91c94c863
child 613 bb1439f14ffb
Merge branch 'master' of github.com:json-ld/json-ld.org
--- a/spec/latest/json-ld-api/index.html	Tue May 01 16:33:54 2012 -0400
+++ b/spec/latest/json-ld-api/index.html	Tue May 01 16:34:07 2012 -0400
@@ -1181,7 +1181,7 @@
 <h3>Term Rank Algorithm</h3>
 <p>When selecting among multiple possible terms for a given property, it may be that multiple
   <tref title="term">terms</tref> are defined with the same <tref>IRI</tref>, but differ in <code>@type</code>, <code>@container</code>
-  or <code>@language</code>. The purpose of this algorithm is to take an <tref>term</tref>
+  or <code>@language</code>. The purpose of this algorithm is to take a <tref>term</tref>
   and a value and give it a <tdef>term rank</tdef>. The selection can then be based, partly, on
   the term having the highest <tref>term rank</tref>.</p>
 <p>Given a <tref>term</tref> <em>term</em>, <em>value</em>, and <tref>active context</tref>
@@ -1214,7 +1214,7 @@
           <li>If <em>value</em> has a <code>@type</code> property matching a
             <code>@type</code> coercion for <em>term</em>, <tref>term rank</tref>
             is <code>3</code>, otherwise if <em>term</em> has no <code>@type</code>
-            coersion and no <code>@language</code>, <tref>term rank</tref> is
+            coercion and no <code>@language</code>, <tref>term rank</tref> is
             <code>1</code>, otherwise <code>0</code>.</li>
           <li>Otherwise, if <em>value</em> has a <code>@language</code> property matching a
             <code>@language</code> definition for <em>term</em> (or
@@ -1222,13 +1222,13 @@
             <code>@language</code> in the <tref>active context</tref> matches the
             <em>value</em> <code>@language</code>), <tref>term rank</tref> is
             <code>3</code>, otherwise if <em>term</em> has no <code>@type</code>
-            coersion and no <code>@language</code>, <tref>term rank</tref> is
+            coercion and no <code>@language</code>, <tref>term rank</tref> is
             <code>1</code>, otherwise <code>0</code>.</li>
         </ol>
       </li>
       <li>Otherwise, if <em>term</em> has <code>@type</code> coerced to <code>@id</code>,
         <tref>term rank</tref> is <code>3</code>, otherwise
-        if <em>term</em> has no <code>@type</code> coersion and no <code>@language</code>,
+        if <em>term</em> has no <code>@type</code> coercion and no <code>@language</code>,
         <tref>term rank</tref> is <code>1</code>, otherwise <code>0</code>.</li>
     </ol>
   </li>
@@ -2261,19 +2261,19 @@
     <li>For each statement in <em>input</em>:
       <ol class="algorithm">
         <li>Set <em>graph</em> to the entry in <em>graphs</em> identified
-          by <em>name</em>, initializing it to a new entry using the mechanism 
+          by <em>name</em>, initializing it to a new entry using the mechanism
           described in <a href="#new_graph">Step 1</a>.</li>
         <li>If <em>property</em> is <code>rdf:first</code>,
-          use the entry in <em>graph.listMap</em> indexed by <em>subject</em>, 
+          use the entry in <em>graph.listMap</em> indexed by <em>subject</em>,
           initializing it to a new <tref>JSON object</tref> if nesessary. Represent
           <em>object</em> in expanded form, as described in
           <a href="#value-expansion">Value Expansion</a>. Add the
-          resulting <em>object representation</em> to the entry indexed by 
+          resulting <em>object representation</em> to the entry indexed by
           <em>first</em>, and skip to the next statement.</li>
         <li>If <em>property</em> is <code>rdf:rest</code>:
           <ol class="algorithm">
-            <li>If <em>object</em> is a <a>BlankNode</a>, use the entry in 
-              <em>graph.listMap</em> indexed by <em>subject</em>, initializing it 
+            <li>If <em>object</em> is a <a>BlankNode</a>, use the entry in
+              <em>graph.listMap</em> indexed by <em>subject</em>, initializing it
               to a new <tref>JSON object</tref> if necessary. Add the <em>nominalValue</em> of
               <em>object</em> to the entry indexed by <em>rest</em>.
             </li>
@@ -2310,7 +2310,7 @@
               be <em>object</em> represented in expanded form as described in
               <a href="#value-expansion">Value Expansion</a>.</li>
             <li>If <em>object</em> is a <a>BlankNode</a>,
-              use the entry in <em>graph.listMap</em> indexed by <em>object</em>, 
+              use the entry in <em>graph.listMap</em> indexed by <em>object</em>,
               initializing it to a new <tref>JSON object</tref> if nesessary.
               Add an entry for <em>head</em> with <em>object representation</em>.</li>
             <li>Append <em>object representation</em> to the array value for