Merge branch 'master' of github.com:json-ld/json-ld.org
authorDave Longley <dlongley@digitalbazaar.com>
Mon, 30 Apr 2012 01:11:53 -0400
changeset 590 530e1d7fc915
parent 588 ff2b45afef97 (current diff)
parent 589 d435fafa2f45 (diff)
child 591 e0c5f6ed2804
Merge branch 'master' of github.com:json-ld/json-ld.org
--- a/spec/latest/json-ld-api/index.html	Mon Apr 30 01:11:09 2012 -0400
+++ b/spec/latest/json-ld-api/index.html	Mon Apr 30 01:11:53 2012 -0400
@@ -633,6 +633,9 @@
           <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>