--- a/rdf-primer/index.html	Mon Nov 11 16:53:09 2013 +0100
+++ b/rdf-primer/index.html	Mon Nov 11 17:18:54 2013 +0100
@@ -30,8 +30,8 @@
 
           // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
           // and its maturity status
-          previousPublishDate:  "2004-02-10",
-          previousMaturity:  "REC",
+          // previousPublishDate:  "2004-02-10",
+          // previousMaturity:  "REC",
 
           // if there a publicly available Editor's Draft, this is the link
           edDraftURI:           "https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-primer/index.html",
@@ -172,9 +172,9 @@
       <li>A document describing the formal model-theoretic semantics
       of RDF ("RDF Semantics") [[!RDF11-MT]]</li>
       <li>Specifiations of concrete syntaxes for RDF, such as Turtle
-      [[!TURTLE]] and TriG [[TRIG]]. </li> 
+      [[!TURTLE]] and TriG [[!TRIG]]. </li> 
       <li>The RDF Vocabulary Description Language RDF Schema
-      [[RDF-SCHEMA]],</li>
+      [[!RDF-SCHEMA]],</li>
     </ul>
     
     <p>This primer provides a roadmap for people who want to study the
@@ -219,20 +219,20 @@
 
     <h3>RDF Statement</h3>
     
-    <p>RDF allows us to make statements about resources indetified
-    with an IRI. The format of these statements is simple. It always
+    <p>RDF allows us to make statements about resources.
+    The format of these statements is simple. It always
     has the following form:<p>
    <pre>
       &lt;subject&gt;  &lt;predicate&gt; &lt;object&gt;
     </pre>
-    <p>The <strong>subject</strong> is the Web resource we like to
+    <p>The <strong>subject</strong> is the resource we like to
     make a statement about. The <strong>predicate</strong> represents
     the feature we want to make a statement about. The
     <strong>object</strong> represents the value of the feature
     for this subject. Informally speaking, RDF allows us to make
     statements of the form:</p> 
 
-    <pre>
+    <pre class="example">
       &lt;Bob&gt; &lt;is a&gt; &lt;person&gt;.
       &lt;Alice&gt; &lt;is a&gt; &lt;person&gt;.
       &lt;Bob&gt; &lt;is a friend of&gt; &lt;Alice&gt;.
@@ -255,6 +255,7 @@
       <figcaption>Informal graph of the sample triples</figcaption>
     </figure>
 
+    
     <div class="issue">The following is just one way of representing RDF in relational terms, not sure it is needed</div>
 
     <div class="note">Readers familiar with databases could view the RDF
@@ -262,6 +263,7 @@
     predicate forms a two-column table with subjects in the first
     column and objects in the second column. </div>
 
+    
     <p>In the following sections we discuss the three basic constructs
     that appear in RDF statements, namely IRIs, literals and blank nodes, in more detail. </p>
 
@@ -273,40 +275,32 @@
 
       <h3>IRI</h3>
 
-    <p class="note">A Web resource is anything we can point to with a
-    Web identifier. Technically, a Web identifier is called an IRI,
-    short for "International Resource Identifier".  A URL (Uniform
-    Resource Locator) which we put in our Web browser is a typical
-    example of an IRI: we can <em>retrieve</em> the resource through
-    the URL. There are also IRIs that are used to identify things we
-    cannot "retrieve", such as people or products. For example, if
-    Bob's home page is <code>http://www.example.com/bob</code> a
-    popular convention is to use the IRI
-    <code>http://www.example.com/bob#me</code> as a Web identifier for
-    Bob himself. </p>
+    <p>The abbreviation IRI is short for "International Resource
+    Identifier".  An IRI identifies a Web resource. IRIs are
+    generalization of URIs (Uniform Resource Indeitfiers), allowing
+    non-ASCII characters to be used in the IRI character string.</p>
 
-
-      <p>IRIs can appear in all three positions of an RDF statement and are specified
-      in RFC 3987 [[!RFC3987]]. They can be used to identify both documents
-      (e.g. a Web page) and things (e.g. a person). </p>
+    <p>IRIs can appear in all three positions of an RDF statement and are specified
+    in RFC 3987 [[!RFC3987]]. They can be used to identify both documents
+    (e.g. a Web page) and things (e.g. a person). 
+    For example, the IRI for the "Mona Lisa" painting in
+    <a href="http://www.wikidata.org/">Wikidata</a> is:</p>
 
-      <p>For example, the IRI for the "Mona Lisa" painting in <a href="http://www.wikidata.org/">Wikidata</a> 
-      is:</p>
+      <pre "example">http://www.wikidata.org/entity/Q12418</pre>
 
-      <pre>http://www.wikidata.org/entity/Q12418</pre>
+    <p>The IRI for a Web page about this painting in Wikidata is:</p>
 
-      <p>The IRI for a Web page about this painting in Wikidata is:</p>
-
-      <pre>http://www.wikidata.org/wiki/Q12418</pre>
+      <pre "example">http://www.wikidata.org/wiki/Q12418</pre>
 
       <p>The IRI for Leonardo da Vinci in <a href="http://viaf.org">VIAF</a> is:</p>
 
-      <pre>http://viaf.org/viaf/24604287/</pre>
+      <pre "example">http://viaf.org/viaf/24604287/</pre>
 
       <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>
 
-      <pre>http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619</pre>
-   
+      <pre "example">http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619</pre>
+
+    <p "note"> </p>
     </section>
 
     <section id="subsection-literal">
@@ -410,7 +404,7 @@
 
       <h3>Turtle</h3>
 
-      <p>Turtle [[TURTLE-TR]] provides a convenient syntax for RDF graphs, introducing numerous
+      <p>Turtle [[TURTLE]] provides a convenient syntax for RDF graphs, introducing numerous
       syntax shortcuts when compared with N-Triples, such as the support for namespaces, lists and shorthands for data-typed
       literals. Turtle provides a good trade-off between ease of writing, ease of parsing and readability. Our example can be represented in
       Turtle as follows.</p>