diff --git a/.project b/.project
index 189aabaff590bbfa2ef14c8b2f73924167c822ce..e2539154879e9ad3dd9db58507e382e283b6c3a0 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>Q</name>
+ <name>GoikLectures</name>
<comment></comment>
<projects>
</projects>
diff --git a/Doc/course.xml b/Doc/course.xml
index f0f7a5e6c2df05b3a9550ad12cfde190206d451b..e51088cb9309ffd4c7e397fe25863beda69c2a15 100644
--- a/Doc/course.xml
+++ b/Doc/course.xml
@@ -2002,10 +2002,10 @@ public class Memo {
customer NUMERIC(5) NOT NULL <emphasis role="bold">REFERENCES Customer</emphasis> <co
xml:id="invoiceSecondFK"/>...</programlisting>
- <remark>This actually is a deficiency of DTD's rather than
- XML. The XML schema standard does not only allow multiple
- foreign key definitions but polymorphic references as
- well.</remark>
+ <remark>This is actually a deficiency of DTD's rather than
+ of XML technologies in general: The XML schema standard
+ allows for multiple foreign key definitions and polymorphic
+ references as well.</remark>
</answer>
</qandaentry>
</qandadiv>
@@ -2512,7 +2512,8 @@ int count = 2; // Fatal error: A variable must not be
<para>Both variants are disallowed: The indicator of
multiplicity <quote>*</quote> is mandatory and the only
- legal token to appear.</para>
+ legal token to appear in a mixed content model's
+ definition.</para>
</answer>
</qandaentry>
</qandadiv>
@@ -2524,25 +2525,27 @@ int count = 2; // Fatal error: A variable must not be
<para>We refer to our first version of our <link
linkend="figure_memo_dtd">memo.dtd</link>. The <tag
- class="element">memo</tag> type declaration reads:</para>
+ class="starttag">memo</tag> content model definition
+ reads:</para>
<programlisting><!ELEMENT memo (from, to+, subject, content)></programlisting>
- <para>Basically this states that for valid document instances a
- <tag class="starttag">memo</tag> node consists of a sequence of
- other nodes. In this context we denote <tag
+ <para>This basically states that any valid <tag
+ class="starttag">memo</tag> document instance consists of a
+ sequence of other nodes. In this context we denote <tag
class="starttag">memo</tag> as <emphasis>parent</emphasis> node.
<tag class="element">from</tag>, <tag class="element">to</tag>,
<tag class="element">subject</tag> and <tag
class="element">content</tag> are called
<emphasis>child</emphasis> nodes or
- <emphasis>children</emphasis> for short.</para>
+ <emphasis>children</emphasis> of <tag
+ class="starttag">memo</tag> for short.</para>
<para>A sequence of elements is a special case of a more general
- definition of element content in the XML specification. We
- already used the <quote>+</quote> operator to allow a node to
- appear multiple times. Actually there are three such operators
- being defined:</para>
+ element content definition in the XML specification. We already
+ used the <quote>+</quote> operator allowing a node to appear
+ multiple times. The DTD standard defines three such operators of
+ multiplicity:</para>
<glosslist>
<glossentry>
@@ -2572,8 +2575,11 @@ int count = 2; // Fatal error: A variable must not be
</glossentry>
</glosslist>
- <para>So far we only talked about sequences of element nodes. We
- may also define mutually exclusive alternatives:</para>
+ <para>Consequently the absence of any such operator declares the
+ node to appear exactly once. So far we only talked about
+ sequences of element nodes. Bi virtue of
+ <quote><code>|</code></quote> we may also define mutually
+ exclusive alternatives:</para>
<figure xml:id="operatorContentAlt">
<title>The operator <quote>|</quote> defining exclusive
@@ -2673,7 +2679,7 @@ int count = 2; // Fatal error: A variable must not be
</production>
</productionset>
- <para>We give two examples:</para>
+ <para>We provide two examples:</para>
<figure xml:id="pureElementContent">
<title>Examples of pure element content models</title>
@@ -7666,7 +7672,7 @@ public class ElementCount {
redefine only those methods corresponding to events actually being
handled by the application in question.</para>
- <qandaset xml:id="sda1SaxReadAttributes">
+ <qandaset defaultlabel="qanda" xml:id="sda1SaxReadAttributes">
<title>SAX and attribute values</title>
<qandadiv>
@@ -11233,7 +11239,7 @@ public class InsertPerson extends JFrame {
ugly mix of GUI components and database related code. We take a
first step to decouple these two distinct concerns:</para>
- <qandaset xml:id="quandaentry_DbLayer">
+ <qandaset defaultlabel="qanda" xml:id="quandaentry_DbLayer">
<title>Handling the database layer</title>
<qandadiv>
@@ -13021,7 +13027,7 @@ INSERT INTO Friends VALUES (1, <emphasis role="bold">'31'</emphasis>, '1991-10-1
</qandadiv>
</qandaset>
- <qandaset xml:id="exerciseHashTraining">
+ <qandaset defaultlabel="qanda" xml:id="exerciseHashTraining">
<title>Passwords and hash values</title>
<qandadiv>
@@ -13139,7 +13145,8 @@ public class TestHashProvider {
</qandadiv>
</qandaset>
- <qandaset xml:id="exerciseInsertLoginCredentials">
+ <qandaset defaultlabel="qanda"
+ xml:id="exerciseInsertLoginCredentials">
<title>Gui authentication: The real McCoy</title>
<qandadiv>