--- a/spec/latest/json-ld/index.html	Thu Jul 04 16:40:18 2013 +0200
+++ b/spec/latest/json-ld/index.html	Thu Jul 04 16:58:05 2013 +0200
@@ -2716,43 +2716,52 @@
     provided:</p>
 
   <ul>
-    <li>A <tdef>JSON-LD document</tdef> serializes an RDF Dataset [[!RDF11-CONCEPTS]], which is a collection of
-      <tref title="graph">graphs</tref> and comprises exactly one
-      <tdef>default graph</tdef> and zero or more <tdef title="named graph">named graphs</tdef>.</li>
+    <li>A <tdef>JSON-LD document</tdef> serializes a
+      <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-generalized-rdf-dataset" class="externalDFN">generalized RDF Dataset</a>
+      [[!RDF11-CONCEPTS]], which is a collection of <tref title="graph">graphs</tref>
+      that comprises exactly one <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-default-graph" class="externalDFN">default graph</a></tdef>
+      and zero or more <tdef title="named graph"><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-named-graph" class="externalDFN">named graphs</a></tdef>.</li>
     <li>The <tref>default graph</tref> does not have a name and MAY be empty.</li>
     <li>Each <tref>named graph</tref> is a pair consisting of an <tref>IRI</tref> or
-      <tref>blank node identifier</tref> (the <tdef>graph name</tdef>) and a <tref>graph</tref>.
-      Whenever practical, the <tref>graph name</tref> SHOULD be an <tref>IRI</tref>.</li>
-    <li>A <tdef>graph</tdef> is a labeled directed graph, i.e., a set of
-      <tref title="node">nodes</tref> connected by <tref title="edge">edges</tref>.</li>
+      <tref>blank node identifier</tref> (the
+      <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-graph-name" class="externalDFN">graph name</a></tdef>)
+      and a <tref>graph</tref>. Whenever practical, the <tref>graph name</tref> SHOULD be an <tref>IRI</tref>.</li>
+    <li>A <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-generalized-rdf-graph" class="externalDFN">graph</a></tdef>
+      is a labeled directed graph, i.e., a set of <tref title="node">nodes</tref>
+      connected by <tref title="edge">edges</tref>.</li>
     <li>Every <tdef>edge</tdef> has a direction associated with it and is labeled with
       an <tref>IRI</tref> or a <tref>blank node identifier</tref>. Within the JSON-LD syntax
-      these edge labels are called <tdef title="property">properties</tdef>. Whenever practical, an
-      <tref>edge</tref> SHOULD be labeled with an <tref>IRI</tref>.</li>
-    <li>Every <tdef>node</tdef> is an <tref>IRI</tref>, a <tref>blank node</tref>,
-      a <tref>JSON-LD value</tref>, or a <tref>list</tref>.</li>
+      these edge labels are called
+      <tdef title="property"><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-property" class="externalDFN">properties</a></tdef>.
+      Whenever practical, an <tref>edge</tref> SHOULD be labeled with an <tref>IRI</tref>.</li>
+    <li>Every <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-node" class="externalDFN">node</a></tdef>
+      is an <tref>IRI</tref>, a <tref>blank node</tref>, a <tref>JSON-LD value</tref>,
+      or a <tref>list</tref>.</li>
     <li>A <tref>node</tref> having an outgoing edge MUST be an <tref>IRI</tref> or a
       <tref>blank node</tref>.</li>
     <li>A <tref>graph</tref> MUST NOT contain unconnected <tref title="node">nodes</tref>,
       i.e., nodes which are not connected by an <tref>edge</tref> to any other <tref>node</tref>.</li>
-    <li>An <tdef><abbr title="Internationalized Resource Identifier">IRI</abbr></tdef>
+    <li>An <tdef><abbr title="Internationalized Resource Identifier"><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-iri" class="externalDFN">IRI</a></abbr></tdef>
       (Internationalized Resource Identifier) is a string that conforms to the syntax
       defined in [[RFC3987]]. <tref title="IRI">IRIs</tref> used within a
       <tref>graph</tref> SHOULD return a Linked Data document describing
       the resource denoted by that <tref>IRI</tref> when being dereferenced.</li>
-    <li>A <tdef>blank node</tdef> is a <tref>node</tref> which is neither an <tref>IRI</tref>,
+    <li>A <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node" class="externalDFN">blank node</a></tdef>
+      is a <tref>node</tref> which is neither an <tref>IRI</tref>,
       nor a <tref>JSON-LD value</tref>, nor a <tref>list</tref>. A blank node MAY be identified
       using a <tref>blank node identifier</tref>.</li>
-    <li>A <tdef>blank node identifier</tdef> is a string that can be used as an identifier
-      for a <tref>blank node</tref> within the scope of a <tref>JSON-LD document</tref>.
-      Blank node identifiers begin with <code>_:</code>.</li>
+    <li>A <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node-identifier" class="externalDFN">blank node identifier</a></tdef>
+      is a string that can be used as an identifier for a <tref>blank node</tref> within
+      the scope of a <tref>JSON-LD document</tref>. Blank node identifiers begin with
+      <code>_:</code>.</li>
     <li>A <tdef>JSON-LD value</tdef> is a <tref>string</tref>, a <tref>number</tref>,
       <tref>true</tref> or <tref>false</tref>, a <tref>typed value</tref>, or a
       <tref>language-tagged string</tref>.</li>
     <li>A <tdef>typed value</tdef> consists of a value, which is a string, and a type, which is an
       <tref>IRI</tref>.</li>
-    <li>A <tdef>language-tagged string</tdef> consists of a string and a non-empty language
-      tag as defined by [[BCP47]]. The language tag MUST be well-formed according to section
+    <li>A <tdef><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-language-tagged-string" class="externalDFN">language-tagged string</a></tdef>
+      consists of a string and a non-empty language tag as defined by [[BCP47]].
+      The language tag MUST be well-formed according to section
       <a href="http://tools.ietf.org/html/bcp47#section-2.2.9">2.2.9 Classes of Conformance</a>
       of [[BCP47]].</li>
     <li>A <tdef>list</tdef> is an sequence of zero or more