Rename URL datatype to IRI as it is used to represent IRIs
authorMarkus Lanthaler <mark_lanthaler@gmx.net>
Thu, 19 Jul 2012 19:33:46 +0200
changeset 779 f36507ab1612
parent 778 62eceab63ea3
child 780 bec6f947e8a8
Rename URL datatype to IRI as it is used to represent IRIs

@gkellogg was there a specific reason for naming it "URL"?
spec/latest/json-ld-api/index.html
spec/latest/json-ld-framing/index.html
--- a/spec/latest/json-ld-api/index.html	Thu Jul 19 19:30:57 2012 +0200
+++ b/spec/latest/json-ld-api/index.html	Thu Jul 19 19:33:46 2012 +0200
@@ -708,8 +708,7 @@
     <dd>Any node in a <tref>linked data graph</tref> with at least one
     outgoing edge.</dd>
     <dt><tdef><abbr title="Internationalized Resource Identifier">IRI</abbr></tdef></dt>
-    <dd>An Internationalized Resource Identifier as described
-    in [[!RFC3987]]).</dd>
+    <dd>An Internationalized Resource Identifier as described in [[!RFC3987]].</dd>
     <dt><tdef>object</tdef></dt>
     <dd>A node in a <tref>linked data graph</tref> with at least one
     incoming edge.</dd>
@@ -750,10 +749,10 @@
         no errors. If the expansion fails, an appropriate exception MUST be thrown.
 
         <dl class="parameters">
-          <dt>object or object[] or URL input</dt>
+          <dt>object or object[] or IRI 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>object or URL? context</dt>
+          <dt>object or IRI? context</dt>
           <dd>An optional external context to use additionally to the context embedded in
             <code>input</code> when expanding the <code>input</code>.</dd>
           <dt>JsonLdCallback callback</dt>
@@ -790,10 +789,10 @@
         thrown.
 
         <dl class="parameters">
-          <dt>object or object[] or URL input</dt>
+          <dt>object or object[] or IRI 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 URL context</dt>
+          <dt>object or IRI 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>
@@ -848,8 +847,8 @@
         <a href="#convert-to-rdf-algorithm">Convert to RDF Algorithm</a>, calling
         the provided <code>callback</code> for each <ldtref>Quad</ldtref> generated.
         <dl class="parameters">
-          <dt>object or object[] or URL input</dt>
-          <dd>The JSON-LD object or array of JSON-LD objects to convert to RDF or a <a>URL</a>
+          <dt>object or object[] or IRI input</dt>
+          <dd>The JSON-LD object or array of JSON-LD objects to convert to RDF or a <a>IRI</a>
             referencing the JSON-LD document to convert to RDF.</dd>
           <dt>QuadCallback callback</dt>
           <dd>A callback that is called when a <ldtref>Quad</ldtref> is created from processing
@@ -924,13 +923,12 @@
     <p>This section describes datatype definitions used within the JSON-LD API.</p>
 
     <section>
-    <h3>URL</h3>
-    <p>The <a>URL</a> datatype is a string representation of an <tref>IRI</tref>.</p>
-    <div title="typedef DOMString URL" class="idl">
-      This datatype indicates that the <tref>IRI</tref> is interpreted as a Universal Resource
-      Locator
-      identifying a document, which when parsed as JSON yields either a <code>JSON object</code>
-      or <code>array</code>.
+    <h3>IRI</h3>
+    <p>The <a>IRI</a> datatype is a string representation of an <tref>IRI</tref>.</p>
+    <div title="typedef DOMString IRI" class="idl">
+      This datatype indicates that the <em>string</em> is interpreted as an Internationalized
+      Resource Identifier [[!RFC3987]] identifying a document, which when parsed as JSON yields
+      either a <tref>JSON object</tref> or <tref>array</tref>.
     </div>
     </section>
 
@@ -938,10 +936,10 @@
     <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>URL? base</dt>
+      <dt>IRI? 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>URL</a>. If not specified and <em>input</em> is not
-        an <a>URL</a>, the base IRI defaults to the current document IRI if in a browser context,
+        <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>boolean optimize = false</dt>
       <dd>If set to <code>true</code>, the JSON-LD processor is allowed to
--- a/spec/latest/json-ld-framing/index.html	Thu Jul 19 19:30:57 2012 +0200
+++ b/spec/latest/json-ld-framing/index.html	Thu Jul 19 19:33:46 2012 +0200
@@ -451,10 +451,10 @@
         returned. Exceptions MUST be thrown if there are errors.
 
         <dl class="parameters">
-          <dt>object or object[] or URL input</dt>
+          <dt>object or object[] or IRI input</dt>
            <dd>The JSON-LD object or array of JSON-LD objects to perform the framing upon or an
             <tref>IRI</tref> referencing the JSON-LD document to frame.</dd>
-          <dt>object or URL frame</dt>
+          <dt>object or IRI frame</dt>
           <dd>The frame to use when re-arranging the data of <code>input</code>; either
             in the form of an <tref>JSON object</tref> or as <tref>IRI</tref>.</dd>
           <dt>JsonLdCallback callback</dt>
@@ -477,15 +477,15 @@
           added or not. See <a href="https://github.com/json-ld/json-ld.org/issues/109">ISSUE-109</a>.</p>
 
         <dl class="parameters">
-          <dt>object or object[] or URL input</dt>
+          <dt>object or object[] or IRI input</dt>
           <dd>The JSON-LD object or array of JSON-LD objects to flatten or an
             <tref>IRI</tref> referencing the JSON-LD document to flatten.</dd>
-          <dt>string or URL graph</dt>
+          <dt>string or IRI graph</dt>
           <dd>The graph in the document that should be flattened. To return the default
             graph <code>@default</code> has to be passed, for the merged graph <code>@merged</code>
             and for any other graph the <tref>IRI</tref> identifying the graph has to be passed. The
             default value is <code>@merged</code>.</dd>
-          <dt>object or URL? context</dt>
+          <dt>object or IRI? context</dt>
           <dd>An optional external context to use additionally to the context embedded in
             <code>input</code> when expanding the <code>input</code>.</dd>
           <dt>JsonLdCallback callback</dt>