--- a/rdf-primer/index.html	Fri Nov 29 14:45:29 2013 +0000
+++ b/rdf-primer/index.html	Fri Nov 29 15:01:31 2013 +0000
@@ -336,20 +336,19 @@
       <div class="example"><a href="http://www.wikidata.org/entity/Q12418">http://www.wikidata.org/entity/Q12418</a></div>
 
       <p>The IRI for Leonardo da Vinci in <a
-      href="http://viaf.org">VIAF</a> (Virtual International Authority
-      File) is:</p>
+      href="http://dbpedia.org.org">DBpedia</a> is:</p>
 
-      <div class="example"><a href="http://viaf.org/viaf/24604287/">http://viaf.org/viaf/24604287/</a></div>
+      <div class="example"><a href="http://dbpedia.org/resource/Leonardo_da_Vinci">http://dbpedia.org/resource/Leonardo_da_Vinci</a></div>
 
       <p>The IRI for an <a href="http://www.ina.fr">INA</a> video about the Mona Lisa in <a href="http://www.europeana.eu">Europeana</a> is:</p>
 
       <div class="example"><a href="http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619">http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619</a></div>
 
-    <p class="note">RDF is agnostic about what the IRI stands for. However,
+    <!--p class="note">RDF is agnostic about what the IRI stands for. However,
     IRIs may be given meaning by particular vocabularies or
     conventions. VIAF (see example above) is an example of such a vocabulary. RDF
     vocabularies are discussed in more detail in Sec. <a
-    href="#section-vocabulary">"RDF vocabularies"</a>. </p>
+    href="#section-vocabulary">"RDF vocabularies"</a>. </p-->
     
     </section>
 
@@ -681,12 +680,12 @@
 11        schema:birthDate "1990-07-04"^^xsd:date ;
 12        foaf:topic_interest wd:Q12418 .
 13
-14    &lt;http://viaf.org/viaf/24604287/&gt;
+14    &lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt;
 15        a foaf:Person ;
 16        foaf:name "Leonardo da Vinci" .
 17
 18    wd:Q12418
-19        dcterms:creator &lt;http://viaf.org/viaf/24604287/&gt; .
+19        dcterms:creator &lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; .
 20
 21    &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D61set&gt;
 22        dcterms:subject wd:Q12418 .
@@ -801,12 +800,12 @@
 16
 17    &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt;
 18      {
-19        &lt;http://viaf.org/viaf/24604287/&gt;
+19        &lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt;
 20            a foaf:Person ;
 21            foaf:name "Leonardo da Vinci" .
 22    
 23        wd:Q12418
-24            dcterms:creator &lt;http://viaf.org/viaf/24604287/&gt; .
+24            dcterms:creator &lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; .
 25    
 26        &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619&gt;
 27           dcterms:subject wd:Q12418 .
@@ -1008,7 +1007,7 @@
         Bob is interested in &lt;a rel="foaf:topic_interest" resource="wd:Q12418"&gt;the Mona Lisa&lt;/a&gt;.
       &lt;/p&gt;
       &lt;div about="wd:Q12418"&gt;
-        The Mona Lisa was painted by &lt;a rel="dcterms:creator" typeof="foaf:Person" href="http://viaf.org/viaf/24604287/"&gt;&lt;span property="foaf:name"&gt;Leonardo da Vinci&lt;/span&gt;&lt;/a&gt;
+        The Mona Lisa was painted by &lt;a rel="dcterms:creator" typeof="foaf:Person" href="http://dbpedia.org/resource/Leonardo_da_Vinci"&gt;&lt;span property="foaf:name"&gt;Leonardo da Vinci&lt;/span&gt;&lt;/a&gt;
         and is the subject of this &lt;a rev="dcterms:subject" href="http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619"&gt;video document&lt;/a&gt;.
       &lt;/div&gt;
   &lt;/div&gt;
@@ -1049,7 +1048,7 @@
         "@id": "http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619"
     },
     "dcterms:creator": {
-      "@id": "http://viaf.org/viaf/24604287/",
+      "@id": "http://dbpedia.org/resource/Leonardo_da_Vinci",
       "@type": "foaf:Person",
       "foaf:name": "Leonardo da Vinci"
     }
@@ -1101,7 +1100,7 @@
           "dcterms:subject": {
             "@id": "http://www.wikidata.org/entity/Q12418",
             "dcterms:creator": {
-              "@id": "http://viaf.org/viaf/24604287/",
+              "@id": "http://dbpedia.org/resource/Leonardo_da_Vinci",
               "@type": "foaf:Person",
               "foaf:name": "Leonardo da Vinci"
             }
@@ -1127,9 +1126,9 @@
 &lt;http://example.org/bob#me&gt; &lt;http://xmlns.com/foaf/0.1/knows&gt; &lt;http://example.org/alice#me&gt;.
 &lt;http://example.org/bob#me&gt; &lt;http://schema.org/birthDate&gt; "1990-07-04"^^&lt;http://www.w3.org/2001/XMLSchema#date&gt;.
 &lt;http://example.org/bob#me&gt; &lt;http://xmlns.com/foaf/0.1/topic_interest&gt; &lt;http://www.wikidata.org/entity/Q12418&gt;.
-&lt;http://viaf.org/viaf/24604287/&gt; &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; &lt;http://xmlns.com/foaf/0.1/Person&gt;.
-&lt;http://viaf.org/viaf/24604287/&gt; &lt;http://xmlns.com/foaf/0.1/name&gt; "Leonardo da Vinci".
-&lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://purl.org/dc/terms/creator&gt; &lt;http://viaf.org/viaf/24604287/&gt;.
+&lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; &lt;http://xmlns.com/foaf/0.1/Person&gt;.
+&lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; &lt;http://xmlns.com/foaf/0.1/name&gt; "Leonardo da Vinci".
+&lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://purl.org/dc/terms/creator&gt; &lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt;.
 &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619&gt; &lt;http://purl.org/dc/terms/subject&gt; &lt;http://www.wikidata.org/entity/Q12418&gt;.
       </pre>
 
@@ -1146,9 +1145,9 @@
 &lt;http://example.org/bob#me&gt; &lt;http://xmlns.com/foaf/0.1/knows&gt; &lt;http://example.org/alice#me&gt; &lt;http://example.org/bob&gt; .
 &lt;http://example.org/bob#me&gt; &lt;http://schema.org/birthDate&gt; "1990-07-04"^^&lt;http://www.w3.org/2001/XMLSchema#date&gt; &lt;http://example.org/bob&gt; .
 &lt;http://example.org/bob#me&gt; &lt;http://xmlns.com/foaf/0.1/topic_interest&gt; &lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://example.org/bob&gt; .
-&lt;http://viaf.org/viaf/24604287/&gt; &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; &lt;http://xmlns.com/foaf/0.1/Person&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
-&lt;http://viaf.org/viaf/24604287/&gt; &lt;http://xmlns.com/foaf/0.1/name&gt; "Leonardo da Vinci" &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
-&lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://purl.org/dc/terms/creator&gt; &lt;http://viaf.org/viaf/24604287/&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
+&lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; &lt;http://xmlns.com/foaf/0.1/Person&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
+&lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; &lt;http://xmlns.com/foaf/0.1/name&gt; "Leonardo da Vinci" &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
+&lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://purl.org/dc/terms/creator&gt; &lt;http://dbpedia.org/resource/Leonardo_da_Vinci&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
 &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619&gt; &lt;http://purl.org/dc/terms/subject&gt; &lt;http://www.wikidata.org/entity/Q12418&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
 &lt;http://example.org/bob&gt; &lt;http://purl.org/dc/terms/publisher&gt; &lt;http://example.org&gt; .
 &lt;http://example.org/bob&gt; &lt;http://purl.org/dc/terms/rights&gt; &lt;http://creativecommons.org/licenses/by/3.0/&gt; .
@@ -1176,11 +1175,11 @@
     &lt;foaf:knows rdf:resource="http://example.org/alice#me"/&gt;
     &lt;foaf:topic_interest rdf:resource="http://www.wikidata.org/entity/Q12418"/&gt;
   &lt;/foaf:Person&gt;
-  &lt;foaf:Person rdf:about="http://viaf.org/viaf/24604287/"&gt;
+  &lt;foaf:Person rdf:about="http://dbpedia.org/resource/Leonardo_da_Vinci"&gt;
     &lt;foaf:name&gt;Leonardo da Vinci&lt;/foaf:name&gt;
   &lt;/foaf:Person&gt;
   &lt;rdf:Description rdf:about="http://www.wikidata.org/entity/Q12418"&gt;
-    &lt;dcterms:creator rdf:resource="http://viaf.org/viaf/24604287/"/&gt;
+    &lt;dcterms:creator rdf:resource="http://dbpedia.org/resource/Leonardo_da_Vinci"/&gt;
   &lt;/rdf:Description&gt;
   &lt;rdf:Description rdf:about="http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619"&gt;
     &lt;dcterms:subject rdf:resource="http://www.wikidata.org/entity/Q12418"/&gt;