diff --git a/Doc/course.xml b/Doc/course.xml
index 3b56941519d387e6684f41d68cbefa84e0cd5f3f..09aeaab3a54e94da0f8be81e3a2b1b653c4883f9 100644
--- a/Doc/course.xml
+++ b/Doc/course.xml
@@ -2069,7 +2069,9 @@ public class Memo {
           programming languages:</para>
 
           <productionset>
-            <title>White Space</title>
+            <title><link
+            xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#NT-S">White
+            Space</link></title>
 
             <production xml:id="w3RecXml_NT-S">
               <lhs>S</lhs>
@@ -2089,7 +2091,9 @@ public class Memo {
           defining element attributes.</para>
 
           <productionset>
-            <title>Names and Tokens</title>
+            <title><link
+            xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#d0e804">Names
+            and Tokens</link></title>
 
             <production xml:id="w3RecXml_NT-NameChar">
               <lhs>NameChar</lhs>
@@ -2155,7 +2159,9 @@ public class Memo {
             type definitions</link>:</para>
 
             <productionset xml:id="productionset_element_decl">
-              <title>Element Type Declaration</title>
+              <title><link
+              xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#dt-eldecl">Element
+              Type Declaration</link></title>
 
               <production xml:id="w3RecXml_NT-elementdecl">
                 <lhs>elementdecl</lhs>
@@ -2441,7 +2447,9 @@ int count = 2;       // Fatal error: A variable must not be
               models as:</para>
 
               <productionset xml:id="productionset_w3RecXml_NT-Mixed">
-                <title>Mixed-content Declaration</title>
+                <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-mixed-content">Mixed-content
+                Declaration</link></title>
 
                 <production xml:id="w3RecXml_NT-Mixed">
                   <lhs>Mixed</lhs>
@@ -2635,7 +2643,9 @@ int count = 2;       // Fatal error: A variable must not be
               nested:</para>
 
               <productionset>
-                <title>Element-content Models</title>
+                <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-element-content">Element-content
+                Models</link></title>
 
                 <production xml:id="w3RecXml_NT-children">
                   <lhs>children</lhs>
@@ -3074,7 +3084,9 @@ int count = 2;       // Fatal error: A variable must not be
               <para>The precise definition is:</para>
 
               <productionset>
-                <title><acronym>CDATA</acronym> Sections</title>
+                <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-cdata-sect"><acronym>CDATA</acronym>
+                Sections</link></title>
 
                 <production xml:id="w3RecXml_NT-CDSect">
                   <lhs>CDSect</lhs>
@@ -3243,7 +3255,8 @@ int count = 2;       // Fatal error: A variable must not be
               belonging to element types as:</para>
 
               <productionset>
-                <title>Attribute-list Declaration</title>
+                <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#attdecls">Attribute-list Declaration</link></title>
 
                 <production xml:id="w3RecXml_NT-AttlistDecl">
                   <lhs>AttlistDecl</lhs>
@@ -3299,7 +3312,8 @@ int count = 2;       // Fatal error: A variable must not be
               only one among other possible attribute types:</para>
 
               <productionset>
-                <title>Attribute Types</title>
+                <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-attribute-types">Attribute Types</link></title>
 
                 <production xml:id="w3RecXml_NT-AttType">
                   <lhs>AttType</lhs>
@@ -3341,7 +3355,8 @@ int count = 2;       // Fatal error: A variable must not be
                       value definitions as:</para>
 
                       <productionset>
-                        <title>Literals</title>
+                        <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#d0e888">Literals</link></title>
 
                         <production xml:id="w3RecXml_NT-EntityValue">
                           <lhs>EntityValue</lhs>
@@ -3517,7 +3532,8 @@ int count = 2;       // Fatal error: A variable must not be
               tokens:</para>
 
               <productionset>
-                <title>Enumerated Attribute Types</title>
+                <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#d0e3200">Enumerated Attribute Types</link></title>
 
                 <production xml:id="w3RecXml_NT-EnumeratedType">
                   <lhs>EnumeratedType</lhs>
@@ -4311,7 +4327,8 @@ int count = 2;       // Fatal error: A variable must not be
             already. The formal production rule reads:</para>
 
             <productionset>
-              <title>Attribute Defaults</title>
+              <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-attr-defaults">Attribute Defaults</link></title>
 
               <production xml:id="w3RecXml_NT-DefaultDecl">
                 <lhs>DefaultDecl</lhs>
@@ -4592,8 +4609,10 @@ double quote character.</errortext></programlisting>
                   even for <code>PUBLIC</code> identifiers a system literal is
                   mandatory:</para>
 
-                  <productionset>
-                    <title>External Entity Declaration</title>
+                  <productionset xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-external-ent">
+                    <title><link
+                    xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#sec-external-ent">External
+                    Entity Declaration</link></title>
 
                     <production xml:id="w3RecXml_NT-ExternalID">
                       <lhs>ExternalID</lhs>
@@ -4608,15 +4627,6 @@ double quote character.</errortext></programlisting>
                       <nonterminal
                       def="#w3RecXml_NT-SystemLiteral">SystemLiteral</nonterminal></rhs>
                     </production>
-
-                    <production xml:id="w3RecXml_NT-NDataDecl">
-                      <lhs>NDataDecl</lhs>
-
-                      <rhs><nonterminal def="#w3RecXml_NT-S">S</nonterminal>
-                      'NDATA' <nonterminal
-                      def="#w3RecXml_NT-S">S</nonterminal> <nonterminal
-                      def="#w3RecXml_NT-Name">Name</nonterminal></rhs>
-                    </production>
                   </productionset>
                 </answer>
               </qandaentry>
@@ -13982,7 +13992,8 @@ java.lang.ArrayIndexOutOfBoundsException: 5
       <title>W3C production rules</title>
 
       <productionset>
-        <title>Characters</title>
+        <title><link
+                xlink:href="http://www.w3.org/TR/2008/REC-xml-20081126/#charsets">Characters</link></title>
 
         <production xml:id="w3RecXml_NT-Letter">
           <lhs>Letter</lhs>