Merge branch 'origin/master'
authorGregg Kellogg <gregg@kellogg-assoc.com>
Sat, 20 Jul 2013 14:43:18 -0700
changeset 1793 9e1a5948a829
parent 1791 6302e610dfd2 (current diff)
parent 1792 2eec17f7f1a7 (diff)
child 1794 98f39e094f89
Merge branch 'origin/master'
spec/latest/json-ld-api/index.html
--- a/spec/latest/json-ld-api/index.html	Sat Jul 20 14:37:51 2013 -0700
+++ b/spec/latest/json-ld-api/index.html	Sat Jul 20 14:43:18 2013 -0700
@@ -3839,8 +3839,10 @@
            <dd>The JSON-LD object or array of JSON-LD objects to perform the compaction upon or an
             <tref>IRI</tref> referencing the JSON-LD document to compact.</dd>
           <dt>JsonLdContext context</dt>
-          <dd>The context to use when compacting the <code>input</code>; either in the
-            form of a <tref>JSON object</tref> or as <tref>IRI</tref>.</dd>
+          <dd>The context to use when compacting the <code>input</code>; 
+            it can be specified by using a <tref>JSON object</tref>, an 
+            <tref>IRI</tref>, or an array consisting of 
+            <tref>JSON object</tref>s and <tref>IRI</tref>s.</dd>
           <dt>optional JsonLdOptions options</dt>
           <dd>A set of options to configure the algorithms. This allows, e.g.,
             to set the input document's base <tref>IRI</tref>.</dd>
@@ -3946,8 +3948,10 @@
            <dd>The JSON-LD object or array of JSON-LD objects or an <tref>IRI</tref>
             referencing the JSON-LD document to flatten.</dd>
           <dt>optional JsonLdContext? context</dt>
-          <dd>The context to use when compacting the flattened <code>input</code>; either
-            in the form of a <tref>JSON object</tref> or as <tref>IRI</tref>. If not
+          <dd>The context to use when compacting the flattened <code>input</code>;
+            it can be specified by using a <tref>JSON object</tref>, an 
+            <tref>IRI</tref>, or an array consisting of <tref>JSON object</tref>s 
+            and <tref>IRI</tref>s.</dd> If not
             passed or <tref>null</tref> is passed, the result will not be compacted
             but kept in expanded form.</dd>
           <dt>optional JsonLdOptions options</dt>
@@ -3957,9 +3961,11 @@
       </dd>
     </dl>
 
-    <div class='idl' title='typedef (object or DOMString) JsonLdContext'>
-      <p>The identifier <a>JsonLdContext</a> is used to refer to the
-        <span class="idlTypedefType">(object or DOMString)</span> type.</p>
+    <div class='idl' title='typedef (object or DOMString or (object or DOMString)[]) JsonLdContext'>
+      <p>The <a>JsonLdContext</a> type is used to refer to a value that
+      that may be a <tref>JSON object</tref>, an <tref>IRI</tref>, or an
+      array of <tref>JSON object</tref>s and <tref>IRI</tref>s.
+      </p>
     </div>
   </section> <!-- end of JsonLdProcessor -->