diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 4f9e407ffd..dc3759f0ad 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -165,21 +165,21 @@
 
 	  <para>F�gen Sie in eine der existierenden �bungsdateien folgendes ein:</para>
 
-	  <programlisting><![CDATA[<h1>Erstes Kapitel</h1>
+	  <programlisting>&lt;h1&gt;Erstes Kapitel&lt;/h1&gt;
 
-<!-- Hier steht die Einf�hrung -->
+&lt;!&hyphen;- Hier steht die Einf�hrung -&hyphen;&gt;
 
-<h2>Das ist die �berschrift des ersten Kapitels</h2>
+&lt;h2&gt;Das ist die �berschrift des ersten Kapitels&lt;/h2&gt;
 
-<!-- Hier steht der Inhalt des ersten Kapitels -->
+&lt;!&hyphen;- Hier steht der Inhalt des ersten Kapitels -&hyphen;&gt;
 
-<h3>Das ist die �berschrift des ersten Unterkapitels</h3>
+&lt;h3&gt;Das ist die �berschrift des ersten Unterkapitels&lt;/h3&gt;
 
-<!-- Hier steht der Inhalt des ersten Unterkapitels -->
+&lt;!&hyphen;- Hier steht der Inhalt des ersten Unterkapitels -&hyphen;&gt;
 
-<h2>Das ist die �berschrift des zweiten Kapitels</h2>
+&lt;h2&gt;Das ist die �berschrift des zweiten Kapitels&lt;/h2&gt;
 
-<!-- Hier steht der Inhalt des zweiten Kapitels -->]]></programlisting>
+&lt;!&hyphen;- Hier steht der Inhalt des zweiten Kapitels -&hyphen;&gt;</programlisting>
 	</example>
 
         <para>Eine XHTML-Seite sollte immer nur eine �berschrift
@@ -198,13 +198,13 @@
 
 	  <para>F�gen Sie in eine der existierenden �bungsdateien folgendes ein:</para>
 
-	  <programlisting><![CDATA[<h1>Erstes Kapitel</h1>
+	  <programlisting>&lt;h1&gt;Erstes Kapitel&lt;/h1&gt;
 
-<!-- Allgemeines zum Dokument -->
+&lt;!&hyphen;- Allgemeines zum Dokument -&hyphen;&gt;
 
-<h3>Unterkapitel</h3>
+&lt;h3&gt;Unterkapitel&lt;/h3&gt;
 
-<!-- h3 folgt direkt auf h1. h2 wurde ausgelassen -->]]></programlisting>
+&lt;!&hyphen;- h3 folgt direkt auf h1. h2 wurde ausgelassen -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -508,10 +508,6 @@
   </tr>
 
   <tr>
-    <!-- Da sich die zusammengefasste Zelle �ber zwei Zeilen
-         erstreckt, befindet sich das die durch dieses <td>
-         definierte Zelle ganz rechts. -->
-
     <td>Mittlere rechte Zelle</td>
   </tr>
 
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index e764116813..6385a2fd8e 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1058,16 +1058,16 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <programlisting>&lt;!-- Testkommentar --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- Text innerhalb eines Kommentars -->
+      <programlisting>
+&lt;!&hyphen;- Text innerhalb eines Kommentars -&hyphen;&gt;
 
-<!-- Ein anderer Kommentar    -->
+6lt;!&hyphen;- Ein anderer Kommentar    -&hyphen;&gt;
 
-<!-- So k�nnen mehrzeilige Kommentare
-     genutzt werden -->
+6lt;!&hyphen;- So k�nnen mehrzeilige Kommentare
+     genutzt werden -&hyphen;&gt;
 
-<!-- Eine andere M�glichkeit f�r --
-  -- mehrzeilige Kommentare.     -->]]></programlisting>
+&lt;!&hyphen;- Eine andere M�glichkeit f�r -&hyphen;
+  &hyphen;- mehrzeilige Kommentare.     -&hyphen;&gt;</programlisting>
     </example>
 
     <para>Hat man fr�her schon Erfahrungen mit HTML gesammelt,
@@ -1086,12 +1086,12 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <example>
       <title>Fehlerhafte SGML-Kommentare</title>
 
-      <programlisting><![CDATA[
-<!-- Innerhalb eines Kommentars --
+      <programlisting>
+&lt;!&hyphen;- Innerhalb eines Kommentars -&hyphen;
 
      DIES IST NICHT TEIL EINES KOMMENTARS
 
-  -- Wieder innerhalb eines Kommentars -->]]></programlisting>
+  &hyphen;- Wieder innerhalb eines Kommentars -&hyphen;&gt;</programlisting>
 
       <para>SGML-Parser w�rden die mittlere Zeile wie folgt
         interpretieren:</para>
@@ -1102,7 +1102,7 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>Da es sich hierbei nicht um g�ltiges SGML handelt, kann
         diese Zeile zur verwirrenden  Fehlermeldungen f�hren.</para>
 
-      <programlisting><![CDATA[<!--------------- Eine wirklich schlechte Idee  --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; Eine wirklich schlechte Idee  &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>Wie das Beispiel zeigt, sollten solche Kommentare
         tunlichst vermieden werden.</para>
@@ -1110,7 +1110,7 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <!--<para>As the example suggests, <emphasis>do not</emphasis> write
       comments like that.</para>-->
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>Ein solcher Kommentar ist (ein wenig) besser, kann aber
         jemanden, der mit SGML noch nicht so vertraut ist,
@@ -1278,8 +1278,6 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 <!ENTITY % param.etwas "etwas">
 <!ENTITY % param.text "Text">
 <!ENTITY % param.neu  "%param.etwas mehr %param.text">
-
-<!-- %param.neu ist jetzt "etwas mehr Text" -->
 ]>]]></programlisting>
         </example>
 
@@ -1423,11 +1421,9 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 <!ENTITY kapitel.1 SYSTEM "kapitel1.xml">
 <!ENTITY kapitel.2 SYSTEM "kapitel2.xml">
 <!ENTITY kapitel.3 SYSTEM "kapitel3.xml">
-<!-- Und so weiter... -->
 ]>
 
 <html>
-  <!-- Jetzt werden die Kapitel �ber die Entit�ten eingebunden -->
 
   &amp;kapitel.1;
   &amp;kapitel.2;
@@ -1489,11 +1485,7 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
           genutzt werden.</para>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!-- Definieren einer Parameterentit�t um die Allgemeinen Entit�ten f�r -->
-<!-- die Kapitel laden zu k�nnen                                        -->
 <!ENTITY % kapitel SYSTEM "kapitel.ent">
-
-<!-- Nun wird der Inhalt der referenzierten Datei geladen -->
 %kapitel;
 ]>
 
diff --git a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 5cad0b9773..fcd2e5c960 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -98,7 +98,7 @@
       von diesen Ports automatisch entsprechend gesetzt.  Ohne
       <application>JadeTeX</application> k�nnen Sie nur die Formate
       HTML und ASCII erzeugen.  Die Formate PostScript und PDF
-      erfordern <application>&tex;</application>.</para>
+      erfordern &tex;.</para>
   </tip>
 
   <sect1 id="tools-mandatory">
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 49626b5055..6b8f2852c8 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -155,21 +155,21 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction goes here -->
+&lt;!&hyphen;- Document introduction goes here -&hyphen;&gt;
 
-<h2>This is the heading for the first section</h2>
+&lt;h2&gt;This is the heading for the first section&lt;/h2&gt;
 
-<!-- Content for the first section goes here -->
+&lt;!&hyphen;- Content for the first section goes here -&hyphen;&gt;
 
-<h3>This is the heading for the first sub-section</h3>
+&lt;h3&gt;This is the heading for the first sub-section&lt;/h3&gt;
 
-<!-- Content for the first sub-section goes here -->
+&lt;!&hyphen;- Content for the first sub-section goes here -&hyphen;&gt;
 
-<h2>This is the heading for the second section</h2>
+&lt;h2&gt;This is the heading for the second section&lt;/h2&gt;
 
-<!-- Content for the second section goes here -->]]></programlisting>
+&lt;!&hyphen;- Content for the second section goes here -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Generally, an XHTML page should have one first level
@@ -188,13 +188,13 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction -->
+&lt;!&hyphen;- Document introduction -&hyphen;&gt;
 
-<h3>Sub-section</h3>
+&lt;h3&gt;Sub-section&lt;/h3&gt;
 
-<!-- This is bad, <h2> has been left out -->]]></programlisting>
+&lt;!&hyphen;- This is bad, &lt;h2&gt; has been left out -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -471,10 +471,6 @@
   </tr>
 
   <tr>
-    <!-- Because the large cell on the left merges into
-         this row, the first <td> will occur on its
-         right -->
-
     <td>Middle right cell</td>
   </tr>
 
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index f24a2b0848..9072cb4999 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -40,8 +40,7 @@
     of XML tricks you will see used in the documentation.</para>
 
   <para>Portions of this section were inspired by Mark Galassi's
-    <ulink
-      url="http://www.galassi.org/mark/mydocs/docbook-intro/docbook-intro.html">Get
+    <ulink url="http://www.galassi.org/mark/mydocs/docbook-intro/docbook-intro.html">Get
       Going With DocBook</ulink>.</para>
 
   <sect1 id="xml-primer-overview">
@@ -816,16 +815,16 @@ example.xml:5: element head: validity error : Element head content does not foll
 
       <programlisting>&lt;!-- test comment --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- This is inside the comment -->
+      <programlisting>
+&lt;!&hyphen;- This is inside the comment -&hyphen;&gt;
 
-<!-- This is another comment    -->
+&lt;!&hyphen;- This is another comment    -&hyphen;&gt;
 
-<!-- This is one way
-     of doing multiline comments -->
+&lt;!&hyphen;- This is one way
+     of doing multiline comments -&hyphen;&gt;
 
-<!-- This is another way of   --
-  -- doing multiline comments -->]]></programlisting>
+&lt;!&hyphen;- This is another way of   -&hyphen;
+  &hyphen;- doing multiline comments -&hyphen;&gt;</programlisting>
     </example>
 
     <para>If you have used XHTML before you may have been shown
@@ -842,12 +841,12 @@ example.xml:5: element head: validity error : Element head content does not foll
     <example>
       <title>Erroneous XML Comments</title>
 
-      <programlisting><![CDATA[
-<!-- This is in the comment --
+      <programlisting>
+&lt;!&hyphen;- This is in the comment -&hyphen;
 
      THIS IS OUTSIDE THE COMMENT!
 
-  -- back inside the comment -->]]></programlisting>
+  &hyphen;- back inside the comment -&hyphen;&gt;</programlisting>
 
       <para>The XML parser will treat this as though it were
 	actually:</para>
@@ -857,12 +856,12 @@ example.xml:5: element head: validity error : Element head content does not foll
       <para>This is not valid XML, and may give confusing error
 	messages.</para>
 
-      <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
+      <programlisting>&gt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; This is a very bad idea &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>As the example suggests, <emphasis>do not</emphasis> write
 	comments like that.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&gt;!-&hyphen;===================================================-&hyphen;&gt;</programlisting>
 
       <para>That is a (slightly) better approach, but it still
 	potentially confusing to people new to XML.</para>
@@ -998,8 +997,6 @@ example.xml:5: element head: validity error : Element head content does not foll
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
-
-<!-- %param.new now contains "some more text" -->
 ]>]]></programlisting>
       </example>
 
@@ -1024,8 +1021,6 @@ example.xml:5: element head: validity error : Element head content does not foll
     <title>An Example XHTML File</title>
   </head>
 
-  <!-- You might well have some comments in here as well -->
-
   <body>
     <p>This is a paragraph containing some text.</p>
 
@@ -1116,12 +1111,9 @@ example.xml:5: element head: validity error : Element head content does not foll
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
-<!-- And so forth -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <!-- Use the entities to load in the chapters -->
-
   &chapter.1;
   &chapter.2;
   &chapter.3;
@@ -1180,10 +1172,7 @@ example.xml:5: element head: validity error : Element head content does not foll
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!-- Define a parameter entity to load in the chapter general entities -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
-
-<!-- Now use the parameter entity to load in this file -->
 %chapters;
 ]>
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 173191d4c6..8d8b2e437e 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -159,21 +159,21 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![CDATA[<h1>Premi�re section</h1>
+&lt;h1&gt;Premi�re section&lt;/h1&gt;
 
-<!-- Introduction du document -->
+&lt;!&hyphen;- Introduction du document -&hyphen;&gt;
 
-<h2>C'est le titre de la premi�re section</h2>
+&lt;h2&gt;C'est le titre de la premi�re section&lt;/h2&gt;
 
-<!-- Contenu de la premi�re section -->
+&lt;!&hyphen;- Contenu de la premi�re section -&hyphen;&gt;
 
-<h3>C'est le titre de la premi�re sous-section</h3>
+&lt;h3&gt;C'est le titre de la premi�re sous-section&lt;/h3&gt;
 
-<!-- Contenu de la premi�re sous-section -->
+&lt;!&hyphen;- Contenu de la premi�re sous-section -&hyphen;&gt;
 
-<h2>C'est le titre de la seconde section</h2>
+&lt;h2&gt;C'est le titre de la seconde section&lt;/h2&gt;
 
-<!-- Contenu de la seconde section -->]]></programlisting>
+&lt;!&hyphen;- Contenu de la seconde section -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Une page HTML doit normalement avoir un titre de premier niveau
@@ -191,13 +191,13 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Use:</para>
 
 	  <programlisting>
-<![CDATA[<h1>Premi�re section</h1>
+&lt;h1&gt;Premi�re section&lt;/h1&gt;
 
-<!-- Introduction du document -->
+&lt;!&hyphen;- Introduction du document -&hyphen;&gt;
 
-<h3>Sous-section</h3>
+&lt;h3&gt;Sous-section&lt;/h3&gt;
 
-<!-- Ce n'est pas bon, <h2> a �t� oubli� -->]]></programlisting>
+&lt;!&hyphen;- Ce n'est pas bon, &lt;h2&gt; a �t� oubli� -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -470,10 +470,6 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
   </tr>
 
   <tr>
-    <!-- Comme la grande cellule se prolonge
-         sur cette colonne, la premi�re cellule
-         marqu�e par <td> se trouvera &agrave; sa droite -->
-
     <td>Cellule du milieu &agrave; droite</td>
   </tr>
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 6dd690c5fd..d8a64b6ed0 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -856,40 +856,18 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
       <programlisting>
 <!-- commentaire de test --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- C'est le texte du commentaire -->
+      <programlisting>
+&lt;!&hyphen;- C'est le texte du commentaire -&hyphen;&gt;
 
-<!-- C'est un autre commentaire -->
+&lt;!&hyphen;- C'est un autre commentaire -&hyphen;&gt;
 
-<!-- Voici une fa�on de mettre un commentaire
-     sur plusieurs lignes -->
+&lt;!&hyphen;- Voici une fa�on de mettre un commentaire
+     sur plusieurs lignes -&hyphen;&gt;
 
-<!-- Voici une autre fa�on --
-  -- de le faire -->]]></programlisting>
+&lt;!&hyphen;- Voici une autre fa�on -&hyphen;
+  &hyphen;- de le faire -&hyphen;&gt;</programlisting>
     </example>
 
-<!--
-    <![%output.print;[
-    <important>
-      <title>Utilisez 2 tirets</title>
-
-      <para>Vous aurez un probl�me avec les versions PostScript et PDF de ce
-        document. Les exemples pr�c�dents n'auront probablement qu'un simple
-        tiret, <literal>-</literal> apr�s <literal>&lt;!</literal> et avant
-	<literal>&gt;</literal>.</para>
-
-      <para>Il <emphasis>faut</emphasis> utiliser deux <literal>-</literal>,
-        et <emphasis>non</emphasis> un seul. Les versions PostScript et PDF
-        ont converti les deux <literal>-</literal> de l'original en un seul
-	<emphasis>double tiret</emphasis> plus professionnel, et d�form�
-        l'exemple au passage.</para>
-
-      <para>Les versions HTML, texte et RTF de ce document ne sont pas
-	sujettes &agrave; ce probl�me.</para>
-    </important>
-    ]]>
--->
-
     <para>Si vous avez d�j&agrave; utilis� HTML auparavant, on vous a peut-�tre
       donn� des r�gles diff�rentes pour les commentaires. En particulier, vous
       pensez peut-�tre qu'ils commencent par <literal>&lt;!--</literal> et
@@ -903,12 +881,12 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
     <example>
       <title>Commentaires SGML erronn�s</title>
 
-      <programlisting><![CDATA[
-<!-- C'est en commentaire --
+      <programlisting>
+&gt;!&hyphen;- C'est en commentaire -&hyphen;
 
      CE N'EST PAS EN COMMENTAIRE!
 
-  -- retour au commentaire -->]]></programlisting>
+  &hyphen;- retour au commentaire -&hyphen;&gt;</programlisting>
 
       <para>L'analyseur SGML traitera cela comme s'il trouvait&nbsp;:</para>
 
@@ -918,14 +896,12 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
       <para>Ce qui n'est pas du SGML valide et donnera des messages d'erreur
         source de confusion.</para>
 
-      <programlisting>
-<![CDATA[<!--------------- C'est un tr�s mauvaise id�e --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; C'est un tr�s mauvaise id�e &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>Comme l'exemple le sugg�re, ne mettez <emphasis>pas</emphasis> de
         commentaires de ce type.</para>
 
-      <programlisting>
-<![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>C'est une (l�g�rement) meilleure id�e, mais c'est toute de m�me
         une source de confusion potentielle pour les d�butants en SGML.</para>
@@ -1053,8 +1029,6 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 <!ENTITY % param.du "du">
 <!ENTITY % param.texte "text">
 <!ENTITY % param.encore  "encore %param.du more %param.texte">
-
-<!-- %param.encore contient maintenant "encore du texte" -->
 ]>]]></programlisting>
       </example>
 
@@ -1080,8 +1054,6 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
     <title>Exemple de fichier HTML</title>
   </head>
 
-  <!-- Vous pourriez aussi mettre des commentaires ici -->
-
   <body>
     <p>C'est un paragraphe avec du texte.</p>
 
@@ -1175,12 +1147,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 <!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
 <!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
 <!ENTITY chapitre.3 SYSTEM "chapitre3.xml">
-<!-- Et ainsi de suite -->
 ]>
 
 <html>
-  <!-- Utilisation des entit�s pour inclure les chapitres -->
-
   &chapitre.1;
   &chapitre.2;
   &chapitre.3;
@@ -1239,13 +1208,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
 	<programlisting>
 <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!--
-     D�finissez une entit� param�tre pour inclure le fichier
-     des entit�s g�n�rales pour les chapitres
--->
 <!ENTITY % chapitres SYSTEM "chapitres.ent">
-
-<!-- Utilisez maintenant l'entit� g�n�rale pour inclure ce fichier -->
 %chapitres;
 ]>
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
index 66a5801a54..6f61605edd 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
@@ -583,29 +583,26 @@
 
 	  <para>A haszn�lat m�dja:</para>
 
-	  <programlisting><![CDATA[<p>]]>Egy 3x3-as r�cson a bal fels� blokk 2x2 egym�sba olvasztott
-  cell�b�l �ll.  A t�bbi cella norm�lis.<![CDATA[</p>
+	  <programlisting><![CDATA[<p>Egy 3x3-as r�cson a bal fels� blokk 2x2 egym�sba olvasztott
+  cell�b�l �ll.  A t�bbi cella norm�lis.</p>
 
 <table>
   <tr>
-    <td colspan="2" rowspan="2">]]>Bal fels� nagy cella<![CDATA[</td>
+    <td colspan="2" rowspan="2">Bal fels� nagy cella</td>
 
-    <td>]]>Jobb fels� cella<![CDATA[</td>
+    <td>Jobb fels� cella</td>
   </tr>
 
   <tr>
-    <!--]]> Mivel a bal oldalon lev� nagy cella beleolvad az els� sorba,
-         az els� <![CDATA[<td>]]> a jobb oldal�n jelenik meg <![CDATA[-->
-
-    <td>]]>Jobb k�z�ps� cella<![CDATA[</td>
+    <td>Jobb k�z�ps� cella</td>
   </tr>
 
   <tr>
-    <td>]]>Bal als� cella<![CDATA[</td>
+    <td>Bal als� cella</td>
 
-    <td>]]>Bal k�z�ps� cella<![CDATA[</td>
+    <td>Bal k�z�ps� cella</td>
 
-    <td>]]>Jobb als� cella<![CDATA[</td>
+    <td>Jobb als� cella</td>
   </tr>
 </table>]]></programlisting>
 	</example>
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
index 763f5100b4..30c9ea6143 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
@@ -1154,16 +1154,16 @@ onsgmls:pr
 
       <programlisting>&lt;!-- pr�ba megjegyz�s --&gt;</programlisting>
 
-      <programlisting><![CDATA[
-<!--]]> Most a megjegyz�s belsej�ben vagyunk <![CDATA[-->
+      <programlisting>
+&lt;!&hyphen;- Most a megjegyz�s belsej�ben vagyunk -&hyphen;&gt;
 
-<!--]]> Ez pedig egy m�sik megjegyz�s    <![CDATA[-->
+&lt;!&hyphen;- Ez pedig egy m�sik megjegyz�s    -&hyphen;&gt;
 
-<!--]]> �gy lehet p�ld�ul
-     t�bbsoros megjegyz�seket �rni <![CDATA[-->
+&lt;!&hyphen;- �gy lehet p�ld�ul
+     t�bbsoros megjegyz�seket �rni -&hyphen;&gt;
 
-<!--]]> Ez egy m�sik m�dja a   <![CDATA[--
-  --]]> t�bbsoros megjegyz�sek �r�s�nak <![CDATA[-->]]></programlisting>
+&lt;!&hyphen;- Ez egy m�sik m�dja a   -&hyphen;
+  &hyphen;- t�bbsoros megjegyz�sek �r�s�nak -&hyphen;&gt;</programlisting>
     </example>
 
     <para>Ha dolgoztunk m�r kor�bban HTML k�ddal,
@@ -1184,12 +1184,12 @@ onsgmls:pr
     <example>
       <title>Hib�s SGML megjegyz�sek</title>
 
-      <programlisting><![CDATA[
-<!--]]> Most egy megjegyz�s belsej�ben vagyunk <![CDATA[--]]>
+      <programlisting>
+&lt;!&hyphen;- Most egy megjegyz�s belsej�ben vagyunk -&hyphen;&gt;
 
      K�V�L VAGYUNK A MEGJEGYZ�SEN!
 
-  <![CDATA[--]]> ism�t megjegyz�sben vagyunk <![CDATA[-->]]></programlisting>
+  &hyphen;- ism�t megjegyz�sben vagyunk -&hyphen;&gt;</programlisting>
 
       <para>Az SGML elemz� ezt valahogy �gy fogja
 	�rtelmezni:</para>
@@ -1200,12 +1200,12 @@ onsgmls:pr
 	r�ad�sul f�lrevezet� hiba�zenetet
 	eredm�nyez.</para>
 
-      <programlisting><![CDATA[<!------------------]]> Ez nem sz�p dolog! <![CDATA[----------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; Ez nem sz�p dolog! &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>A p�lda sz�vege szerint <emphasis>sem</emphasis>
 	javasolt ilyen megjegyz�seket �rni.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>Ez m�r (valamivel) �rtelmesebb
 	megold�s, de m�g fel�ll a vesz�lye,
@@ -1371,12 +1371,10 @@ onsgmls:pr
 	<title>Param�teregyedek megad�sa</title>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % param.valami "]]>valami<![CDATA[">
-<!ENTITY % param.szoveg "]]>sz�veg<![CDATA[">
-<!ENTITY % param.uj  "%param.valami ]]>m�s<![CDATA[ %param.szoveg">
-
-<!--]]> A %param.uj �rt�ke most m�r "valami m�s sz�veg" <![CDATA[-->
-]>]]></programlisting>
+<!ENTITY % param.valami "valami">
+<!ENTITY % param.szoveg "sz�veg">
+<!ENTITY % param.uj  "%param.valami m�s %param.szoveg">
+]]></programlisting>
       </example>
 
       <para>Ez most m�g nem t�nik
@@ -1400,19 +1398,17 @@ onsgmls:pr
 
 <html>
   <head>
-    <title>]]>Egy minta HTML �llom�ny<![CDATA[</title>
+    <title>Egy minta HTML �llom�ny</title>
   </head>
 
-  <!--]]> Az �llom�nyba rakhatunk az�rt m�g megjegyz�seket <![CDATA[-->
-
   <body>
-    <p>]]>Ebben a bekezd�sben van egy kis sz�veg.<![CDATA[</p>
+    <p>Ebben a bekezd�sben van egy kis sz�veg.</p>
 
-    <p>]]>Ez a bekezd�s m�g tartalmaz n�mi sz�veget.<![CDATA[</p>
+    <p>Ez a bekezd�s m�g tartalmaz n�mi sz�veget.</p>
 
-    <p align="right">]]>Ennek a bekezd�snek jobbra z�rtnak kellene lennie.<![CDATA[</p>
+    <p align="right">Ennek a bekezd�snek jobbra z�rtnak kellene lennie.</p>
 
-    <p>]]>A dokumentum jelenlegi v�ltozata: <![CDATA[&valtozat;</p>
+    <p>A dokumentum jelenlegi v�ltozata: &valtozat;</p>
   </body>
 </html>]]></programlisting>
 	</step>
@@ -1532,11 +1528,9 @@ onsgmls:pr
 <!ENTITY fejezet.1 SYSTEM "fejezet1.xml">
 <!ENTITY fejezet.2 SYSTEM "fejezet2.xml">
 <!ENTITY fejezet.3 SYSTEM "fejezet3.xml">
-<!--]]> �s �gy tov�bb... <![CDATA[-->
 ]>
 
 <html>
-  <!--]]> Az egyedek seg�ts�g�vel v�g�l bet�ltj�k a fejezeteket <![CDATA[-->
 
   &fejezet.1;
   &fejezet.2;
@@ -1613,10 +1607,7 @@ onsgmls:pr
 	  �ltal�nos egyedeket:</para>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!--]]> A fejezetekhez tartoz� egyedek bet�lt�s�hez defini�lunk egy param�teregyedet <![CDATA[-->
 <!ENTITY % fejezetek SYSTEM "fejezetek.ent">
-
-<!--]]> Most pedig a param�teregyeddel t�lts�k be az �llom�nyt <![CDATA[-->
 %fejezetek;
 ]>
 
@@ -1664,11 +1655,11 @@ onsgmls:pr
 
 <html>
   <head>
-    <title>]]>Pr�ba HTML �llom�ny<![CDATA[</title>
+    <title>Pr�ba HTML �llom�ny</title>
   </head>
 
   <body>
-    <p>]]>A dokumentum jelenlegi v�ltozata: <![CDATA[&valtozat;</p>
+    <p>A dokumentum jelenlegi v�ltozata: &valtozat;</p>
 
     &bekezd1;
     &bekezd2;
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index b623738add..be204394ab 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -177,21 +177,21 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![CDATA[<h1>Primeira se��o</h1>
+	  <programlisting>&lt;h1&gt;Primeira se��o&lt;/h1&gt;
 
-<!-- a introdu��o do documento entra aqui -->
+&lt;!&hyphen;- a introdu��o do documento entra aqui -&hyphen;&gt;
 
-<h2>Este � o cabe�alho da primeira se��o</h2>
+&lt;h2&gt;Este � o cabe�alho da primeira se��o&lt;/h2&gt;
 
-<!-- O conte�do da primeira se��o entra aqui -->
+&lt;!&hyphen;- O conte�do da primeira se��o entra aqui -&hyphen;&gt;
 
-<h3>Este � o cabe�alho da primeira subse��o</h3>
+&lt;h3&gt;Este � o cabe�alho da primeira subse��o&lt;/h3&gt;
 
-<!-- O conte�do da primeira subse��o entra aqui -->
+&lt;!&hyphen;- O conte�do da primeira subse��o entra aqui -&hyphen;&gt;
 
-<h2>Este � o heading para a segunda se��o</h2>
+&lt;h2&gt;Este � o heading para a segunda se��o&lt;/h2&gt;
 
-<!-- O conte�do da segunda se��o entra aqui -->]]></programlisting>	    
+&lt;!&hyphen;- O conte�do da segunda se��o entra aqui -&hyphen;&gt;</programlisting>	    
 	</example>
 	
 	<para>Geralmente, uma p�gina HTML deveria ter um 
@@ -211,13 +211,13 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![CDATA[<h1>Primeira se��o</h1>
+	  <programlisting>&lt;h1&gt;Primeira se��o&lt;/h1&gt;
 
-<!-- Introdu��o do documento -->
+&lt;!&hyphen;- Introdu��o do documento -&hyphen;&gt;
 
-<h3>Subse��o</h3>
+&lt;h3&gt;Subse��o&lt;/h3&gt;
 
-<!-- Isto � ruim, n�o foi usado <h2> -->]]></programlisting>
+&lt;!&hyphen;- Isto � ruim, n�o foi usado <h2> -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -509,8 +509,6 @@ c
   </tr>
 
   <tr>
-    <!-- Como a c�lula grande � esquerda funde-se com esta linha,
-         o primeiro <td> ocorrer� � a sua direita. -->
     <td>C�lula do meio a direita</td>
   </tr>
 
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 8d056ae206..fe4d59da50 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1008,16 +1008,16 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <programlisting>&lt;!-- Teste de coment�rio --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- Este � o interior do coment�rio -->
+      <programlisting>
+&lt;!&hyphen;- Este � o interior do coment�rio -&hyphen;&gt;
 
-<!-- Este � outro coment�rio    -->
+&lt;!&hyphen;- Este � outro coment�rio    -&hyphen;&gt;
 
-<!-- Esta � uma forma 
-     de fazer coment�rios de v�rias linhas -->
+&lt;!&hyphen;- Esta � uma forma 
+     de fazer coment�rios de v�rias linhas -&hyphen;&gt;
 
-<!-- Esta � outra forma  --
-  -- de fazer coment�rios de v�rias linhas -->]]></programlisting>
+&lt;!&hyphen;- Esta � outra forma  -&hyphen;
+  &hyphen;- de fazer coment�rios de v�rias linhas -&hyphen;&gt;</programlisting>
     </example>
 
     <para>Se voc� j� utilizou HTML antes, voc� pode ter 
@@ -1037,12 +1037,12 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <example>
       <title>Coment�rios SGML errados</title>
 
-      <programlisting><![CDATA[
-<!-- Este � o coment�rio --
+      <programlisting>
+&lt;!&hyphen;- Este � o coment�rio -&hyphen;
 
      Isto est� fora do coment�rio!
 
-  -- de volta para dentro do coment�rio -->]]></programlisting>
+  &hyphen;- de volta para dentro do coment�rio -&hyphen;&gt;</programlisting>
 
       <para>O interpretador SGML ir� tratar isto como ele 
 	� realmente;</para>
@@ -1052,12 +1052,12 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>Isto n�o � um SGML v�lido, e pode 
 	dar mensagens de erro confusas.</para>
 
-      <programlisting><![CDATA[<!--------------- Isto � uma id�ia muito ruim --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; Isto � uma id�ia muito ruim &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>E como o exemplo sugere, <emphasis>n�o escreva
 	</emphasis> coment�rios como esse.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>Esta � uma abordagem (ligeiramente) melhor, mas 
 	ele ainda � potencialmente confuso para as pessoas 
@@ -1209,8 +1209,6 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
-
-<!-- %param.new agora cont�m "some more text" -->
 ]>]]></programlisting>
       </example>
 	
@@ -1236,8 +1234,6 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <title>Um exemplo de arquivo HTML</title>
   </head>
 
-  <!-- Voc� pode ter alguns coment�rios aqui tamb�m -->
-	  
   <body>	    
     <p>Este � um par�grafo contendo algum texto.</p>
 
@@ -1344,11 +1340,9 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
-<!-- e assim por diante -->
 ]>
 
 <html>
-  <!-- Utilize as entidades para carregar os cap�tulos -->
 
   &chapter.1;
   &chapter.2;
@@ -1414,10 +1408,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  entidades gerais como antes;</para>
 	
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!-- Define uma entidade de par�metro para carregar as entidades gerais de capitulo -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
-
-<!-- Agora utilize a entidade de par�metro para carregar neste arquivo -->
 %chapters;
 ]>
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index 49d080e725..067a90cfb5 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -158,21 +158,21 @@
 
 	  <para>�������������:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- ����� ���������� �������� ��������� -->
+&lt;!&hyphen;- ����� ���������� �������� ��������� -&hyphen;&gt;
 
-<h2>��� ��������� ������� �������</h2>
+&lt;h2&gt;��� ��������� ������� �������&lt;/h2&gt;
 
-<!-- ����� ����������� ���������� ������� ������� -->
+&lt;!&hyphen;- ����� ����������� ���������� ������� ������� -&hyphen;&gt;
 
-<h3>��� ��������� ������� ����������</h3>
+&lt;h3&gt;��� ��������� ������� ����������&lt;/h3&gt;
 
-<!-- ����� ����������� ���������� ������� ���������� -->
+&lt;!&hyphen;- ����� ����������� ���������� ������� ���������� -&hyphen;&gt;
 
-<h2>��� ��������� ������� �������</h2>
+&lt;h2&gt;��� ��������� ������� �������&lt;/h2&gt;
 
-<!-- ����� ����������� ���������� ������� ������� -->]]></programlisting>
+&lt;!&hyphen;- ����� ����������� ���������� ������� ������� -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>������ ������, �� �������� HTML ������ ������� ���� ���������
@@ -189,13 +189,13 @@
 
 	  <para>�������������:</para>
 
-	  <programlisting><![CDATA[<h1>������ ������</h1>
+	  <programlisting>&lt;h1&gt;������ ������&lt;/h1&gt;
 
-<!-- �������� ��������� -->
+&lt;!&hyphen;- �������� ��������� -&hyphen;&gt;
 
-<h3>���������</h3>
+&lt;h3&gt;���������&lt;/h3&gt;
 
-<!-- ��� �����, �������� <h2> -->]]></programlisting>
+&lt;!&hyphen;- ��� �����, �������� <h2> -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -458,9 +458,6 @@
   </tr>
 
   <tr>
-    <!-- ��-�� ����, ��� ������� ������ ����� ������������ �
-	 ��� ������, ������ <td> �������� ������ -->
-
     <td>������� ������ ������</td>
   </tr>
 
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index fa33335ce8..cf77daf84c 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -148,21 +148,21 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction goes here -->
+&lt;!&hyphen;- Document introduction goes here -&hyphen;&gt;
 
-<h2>This is the heading for the first section</h2>
+&lt;h2&gt;This is the heading for the first section&lt;/h2&gt;
 
-<!-- Content for the first section goes here -->
+&lt;!&hyphen;- Content for the first section goes here -&hyphen;&gt;
 
-<h3>This is the heading for the first sub-section</h3>
+&lt;h3&gt;This is the heading for the first sub-section&lt;/h3&gt;
 
-<!-- Content for the first sub-section goes here -->
+&lt;!&hyphen;- Content for the first sub-section goes here -&hyphen;&gt;
 
-<h2>This is the heading for the second section</h2>
+&lt;h2&gt;This is the heading for the second section&lt;/h2&gt;
 
-<!-- Content for the second section goes here -->]]></programlisting>
+&lt;!&hyphen;- Content for the second section goes here -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Generally, an HTML page should have one first level heading
@@ -179,13 +179,13 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction -->
+&lt;!&hyphen;- Document introduction -&hyphen;&gt;
 
-<h3>Sub-section</h3>
+&lt;h3&gt;Sub-section&lt;/h3&gt;
 
-<!-- This is bad, <h2> has been left out -->]]></programlisting>
+&lt;!&hyphen;- This is bad, &lt;h2&gt; has been left out -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -455,10 +455,6 @@
   </tr>
 
   <tr>
-    <!-- Because the large cell on the left merges into
-         this row, the first <td> will occur on its
-         right -->
-
     <td>Middle right cell</td>
   </tr>
 
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
index 238c3a4d66..9ccf202d7e 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
@@ -818,40 +818,18 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <programlisting>&lt;!-- ���յ��� --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- �o�O���� -->
+      <programlisting>
+&lt;!&hyphen;- �o�O���� -&hyphen;&gt;
 
-<!-- �o�]�O����    -->
+&lt;!&hyphen;- �o�]�O����    -&hyphen;&gt;
 
-<!-- �n�g�h����Ѫ��ܡA
-     �o�O�䤤���@���覡 -->
+&lt;!&hyphen;- �n�g�h����Ѫ��ܡA
+     �o�O�䤤���@���覡 -&hyphen;&gt;
 
-<!-- �n�g�h����ѡA   --
-  -- �]�i�H�o�ˤl�� -->]]></programlisting>
+&lt;!&hyphen;- �n�g�h����ѡA   -&hyphen;
+  &hyphen;- �]�i�H�o�ˤl�� -&hyphen;&gt;</programlisting>
     </example>
 
-<!--
-    <![%output.print;[
-    <important>
-      <title>Use 2 dashes</title>
-
-      <para>There is a problem with producing the Postscript and PDF versions
-	of this document.  The above example probably shows just one hyphen
-	symbol, <literal>-</literal> after the <literal>&lt;!</literal> and
-	before the <literal>&gt;</literal>.</para>
-
-      <para>You <emphasis>must</emphasis> use two <literal>-</literal>,
-	<emphasis>not</emphasis> one.  The Postscript and PDF versions have
-	translated the two <literal>-</literal> in the original to a longer,
-	more professional <emphasis>em-dash</emphasis>, and broken this
-	example in the process.</para>
-
-      <para>The HTML, plain text, and RTF versions of this document are not
-	affected.</para>
-    </important>
-    ]]>
--->
-
     <para>If you have used HTML before you may have been shown different rules
       for comments.  In particular, you may think that the string
       <literal>&lt;!--</literal> opens a comment, and it is only closed by
@@ -865,12 +843,12 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <example>
       <title>Erroneous SGML comments</title>
 
-      <programlisting><![CDATA[
-<!-- This is in the comment --
+      <programlisting>
+&lt;!&hyphen;- This is in the comment -&hyphen;
 
      THIS IS OUTSIDE THE COMMENT!
 
-  -- back inside the comment -->]]></programlisting>
+  &hyphen;- back inside the comment -&hyphen;&gt;</programlisting>
 
       <para>The SGML parser will treat this as though it were actually:</para>
 
@@ -879,12 +857,12 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>This is not valid SGML, and may give confusing error
 	messages.</para>
 
-      <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; This is a very bad idea &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>As the example suggests, <emphasis>do not</emphasis> write
 	comments like that.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>That is a (slightly) better approach, but it still potentially
 	confusing to people new to SGML.</para>
@@ -1011,8 +989,6 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
-
-<!-- %param.new now contains "some more text" -->
 ]>]]></programlisting>
       </example>
 
@@ -1036,8 +1012,6 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <title>An example HTML file</title>
   </head>
 
-  <!-- You might well have some comments in here as well -->
-
   <body>
     <p>This is a paragraph containing some text.</p>
 
@@ -1129,11 +1103,9 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
-<!-- And so forth -->
 ]>
 
 <html>
-  <!-- Use the entities to load in the chapters -->
 
   &chapter.1;
   &chapter.2;
@@ -1189,10 +1161,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  for use.  Then use the general entities as before:</para>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!-- Define a parameter entity to load in the chapter general entities -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
-
-<!-- Now use the parameter entity to load in this file -->
 %chapters;
 ]>