--- a/spec/latest/json-ld-api/index.html	Fri Dec 14 17:38:10 2012 +0100
+++ b/spec/latest/json-ld-api/index.html	Fri Dec 14 17:53:15 2012 +0100
@@ -1846,7 +1846,7 @@
         returned via the callback.
 
         <dl class="parameters">
-          <dt>object or object[] or IRI input</dt>
+          <dt>(object or object[] or DOMString) input</dt>
           <dd>The JSON-LD object or array of JSON-LD objects to perform the expansion upon or an
             <tref>IRI</tref> referencing the JSON-LD document to expand.</dd>
           <dt>JsonLdCallback callback</dt>
@@ -1885,10 +1885,10 @@
         returned via the callback.
 
         <dl class="parameters">
-          <dt>object or object[] or IRI input</dt>
+          <dt>(object or object[] or DOMString) input</dt>
            <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>object or IRI context</dt>
+          <dt>(object or DOMString) context</dt>
           <dd>The context to use when compacting the <code>input</code>; either in the
             form of an <tref>JSON object</tref> or as <tref>IRI</tref>.</dd>
           <dt>JsonLdCallback callback</dt>
@@ -1941,21 +1941,21 @@
       <a>JsonLdProcessor</a> error.</p>
 
       <dl title="dictionary JsonLdProcessingError" class="idl">
-        <dt>string type</dt>
+        <dt>DOMString type</dt>
         <dd>a string representing the particular error type,
           such as <code>LIST_OF_LISTS_DETECTED</code>, as described in
           the various algorithms in this document.</dd>
-        <dt>string operation</dt>
+        <dt>DOMString operation</dt>
         <dd>a string representing the operation that was being performed
           when the conformance issue was raised. Valid values for the
           string include <code>compact</code>, and <code>expand</code>.</dd>
         <dt>object or object[] source</dt>
           <dd>An object reference to the original JSON-LD document being
           processed.</dd>
-        <dt>string sourceKey</dt>
+        <dt>DOMString sourceKey</dt>
           <dd>The key value associated with the value that triggered the
           conformance issue.</dd>
-        <dt>object or object[] or string or number sourceValue</dt>
+        <dt>any or any[] sourceValue</dt>
           <dd>The value that triggered the conformance issue.</dd>
       </dl>
     </section>
@@ -1985,13 +1985,13 @@
     <h3>JsonLdOptions</h3>
     <p>The <a>JsonLdOptions</a> type is used to pass various options to the <a>JsonLdProcessor</a> methods.</p>
     <dl title="dictionary JsonLdOptions" class="idl">
-      <dt>IRI? base</dt>
+      <dt>DOMString base</dt>
       <dd>The Base IRI to use when expanding the document. This overrides the value of
         <em>input</em> if it is a <a>IRI</a>. If not specified and <em>input</em> is not
         an <a>IRI</a>, the base IRI defaults to the current document IRI if in a browser context,
         or the empty string if there is no document context.
       </dd>
-      <dt>object or IRI expandContext = null</dt>
+      <dt>object or DOMString expandContext = null</dt>
       <dd>A context that is used to initialize the active context when expanding a document.</dd>
       <dt>boolean compactArrays = true</dt>
       <dd>If set to <code>true</code>, the JSON-LD processor replaces arrays with just