From owner-svn-doc-projects@FreeBSD.ORG  Fri Jul  5 18:30:44 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7C969E54;
 Fri,  5 Jul 2013 18:30:44 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6E1711B94;
 Fri,  5 Jul 2013 18:30:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65IUiUE032430;
 Fri, 5 Jul 2013 18:30:44 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65IUiJU032428;
 Fri, 5 Jul 2013 18:30:44 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307051830.r65IUiJU032428@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 5 Jul 2013 18:30:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42160 - in
 projects/db5/en_US.ISO8859-1/books/fdp-primer: xhtml-markup xml-primer
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 18:30:44 -0000

Author: gabor
Date: Fri Jul  5 18:30:43 2013
New Revision: 42160
URL: http://svnweb.freebsd.org/changeset/doc/42160

Log:
  - Avoid comments in CDATA, which the DB 5.0 converter does not handle

Modified:
  projects/db5/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml	Fri Jul  5 15:16:25 2013	(r42159)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml	Fri Jul  5 18:30:43 2013	(r42160)
@@ -153,21 +153,21 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<h1>First section</h1>
+	<programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction goes here -->
+&lt;!-- Document introduction goes here --&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;!-- Content for the first section goes here --&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;!-- Content for the first sub-section goes here --&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;!-- Content for the second section goes here --&gt;</programlisting>
       </example>
 
       <para>Generally, an <acronym>XHTML</acronym> page should have
@@ -186,13 +186,13 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<h1>First section</h1>
+	<programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction -->
+&lt;!-- Document introduction --&gt;
 
-<h3>Sub-section</h3>
+&lt;h3&gt;Sub-section&lt;/h3&gt;
 
-<!-- This is bad, <h2> has been left out -->]]></programlisting>
+&lt;!-- This is bad, &lt;h2&gt; has been left out --&gt;</programlisting>
       </example>
     </sect2>
 
@@ -459,10 +459,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>
 

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml	Fri Jul  5 15:16:25 2013	(r42159)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml	Fri Jul  5 18:30:43 2013	(r42160)
@@ -813,18 +813,18 @@ example.xml:5: element head: validity er
     <example>
       <title>XML Generic Comment</title>
 
-      <programlisting>&lt;!-- test comment --></programlisting>
+      <programlisting>&lt;!-- test comment --&gt;</programlisting>
 
-      <programlisting><![CDATA[
-<!-- This is inside the comment -->
+      <programlisting>
+&lt;!-- This is inside the comment --&gt;
 
-<!-- This is another comment    -->
+&lt;!-- This is another comment    --&gt;
 
-<!-- This is one way
-     of doing multiline comments -->
+&lt;!-- This is one way
+     of doing multiline comments --&gt;
 
-<!-- This is another way of   --
-  -- doing multiline comments -->]]></programlisting>
+&lt;!-- This is another way of   --
+  -- doing multiline comments --&gt;]]></programlisting>
     </example>
 
     <para>If you have used XHTML before you may have been shown
@@ -841,12 +841,12 @@ example.xml:5: element head: validity er
     <example>
       <title>Erroneous XML Comments</title>
 
-      <programlisting><![CDATA[
-<!-- This is in the comment --
+      <programlisting>
+&lt;!-- This is in the comment --
 
      THIS IS OUTSIDE THE COMMENT!
 
-  -- back inside the comment -->]]></programlisting>
+  -- back inside the comment --&gt;</programlisting>
 
       <para>The XML parser will treat this as though it were
 	actually:</para>
@@ -856,12 +856,12 @@ example.xml:5: element head: validity er
       <para>This is not valid XML, and may give confusing error
 	messages.</para>
 
-      <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
+      <programlisting>&lt;!--------------- This is a very bad idea ---------------&gt;</programlisting>
 
       <para>As the example suggests, <emphasis>do not</emphasis> write
 	comments like that.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!--===================================================--&gt;</programlisting>
 
       <para>That is a (slightly) better approach, but it still
 	potentially confusing to people new to XML.</para>
@@ -992,14 +992,14 @@ example.xml:5: element head: validity er
       <example>
 	<title>Defining Parameter Entities</title>
 
-	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	<programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!ENTITY % param.some "some">
-<!ENTITY % param.text "text">
-<!ENTITY % param.new  "%param.some more %param.text">
+&lt;!ENTITY % param.some "some"&gt;
+&lt;!ENTITY % param.text "text"&gt;
+&lt;!ENTITY % param.new  "%param.some more %param.text"&gt;
 
-<!-- %param.new now contains "some more text" -->
-]>]]></programlisting>
+&lt;!-- %param.new now contains "some more text" --&gt;
+</programlisting>
       </example>
 
       <para>This may not seem particularly useful.  It will be.</para>
@@ -1013,28 +1013,28 @@ example.xml:5: element head: validity er
 	  <para>Add a general entity to
 	    <filename>example.xml</filename>.</para>
 
-	  <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	  <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!ENTITY version "1.1">
-]>
+&lt;!ENTITY version "1.1"&gt;
+]&gt;
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>An Example XHTML File</title>
-  </head>
+&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
+  &lt;head&gt;
+    &lt;title&gt;An Example XHTML File&lt;/title&gt;
+  &lt;/head&gt;
 
-  <!-- You might well have some comments in here as well -->
+  &lt;!-- You might well have some comments in here as well --&gt;
 
-  <body>
-    <p>This is a paragraph containing some text.</p>
+  &lt;body&gt;
+    &lt;p&gt;This is a paragraph containing some text.&lt;/p&gt;
 
-    <p>This paragraph contains some more text.</p>
+    &lt;p&gt;This paragraph contains some more text.&lt;/p&gt;
 
-    <p align="right">This paragraph might be right-justified.</p>
+    &lt;p align="right"&gt;This paragraph might be right-justified.&lt;/p&gt;
 
-    <p>The current version of this document is: &version;</p>
-  </body>
-</html>]]></programlisting>
+    &lt;p&gt;The current version of this document is: &amp;version;&lt;/p&gt;
+  &lt;/body&gt;
+&lt;/html&gt;</programlisting>
 	</step>
 
 	<step>
@@ -1110,21 +1110,21 @@ example.xml:5: element head: validity er
       <example>
 	<title>Using General Entities to Include Files</title>
 
-	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	<programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!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;
-</html>]]></programlisting>
+&lt;!ENTITY chapter.1 SYSTEM "chapter1.xml"&gt;
+&lt;!ENTITY chapter.2 SYSTEM "chapter2.xml"&gt;
+&lt;!ENTITY chapter.3 SYSTEM "chapter3.xml"&gt;
+&lt;!-- And so forth --&gt;
+]&gt;
+
+&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
+  &lt;!-- Use the entities to load in the chapters --&gt;
+
+  &amp;chapter.1;
+  &amp;chapter.2;
+  &amp;chapter.3;
+&lt;/html&gt;</programlisting>
       </example>
 
       <warning>
@@ -1177,20 +1177,20 @@ example.xml:5: element head: validity er
 	  entities available for use.  Then use the general entities
 	  as before:</para>
 
-	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	<programlisting>&lt;!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">
+&lt;!-- Define a parameter entity to load in the chapter general entities --&gt;
+&lt;!ENTITY % chapters SYSTEM "chapters.ent"&gt;
 
-<!-- Now use the parameter entity to load in this file -->
+&lt;!-- Now use the parameter entity to load in this file --&gt;
 %chapters;
-]>
+]&gt;
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-  &chapter.1;
-  &chapter.2;
-  &chapter.3;
-</html>]]></programlisting>
+&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
+  &amp;chapter.1;
+  &amp;chapter.2;
+  &amp;chapter.3;
+&lt;/html&gt;</programlisting>
       </example>
     </sect2>
 
@@ -1216,27 +1216,27 @@ example.xml:5: element head: validity er
 	    <para>Edit <filename>example.xml</filename> so that it
 	      looks like this:</para>
 
-	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	    <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.xml">
-<!ENTITY para2 SYSTEM "para2.xml">
-<!ENTITY para3 SYSTEM "para3.xml">
-]>
+&lt;!ENTITY version "1.1"&gt;
+&lt;!ENTITY para1 SYSTEM "para1.xml"&gt;
+&lt;!ENTITY para2 SYSTEM "para2.xml"&gt;
+&lt;!ENTITY para3 SYSTEM "para3.xml"&gt;
+]&gt;
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>An Example XHTML File</title>
-  </head>
-
-  <body>
-    <p>The current version of this document is: &version;</p>
-
-    &para1;
-    &para2;
-    &para3;
-  </body>
-</html>]]></programlisting>
+&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
+  &lt;head&gt;
+    &lt;title&gt;An Example XHTML File&lt;/title&gt;
+  &lt;/head&gt;
+
+  &lt;body&gt;
+    &lt;p&gt;The current version of this document is: &amp;version;&lt;/p&gt;
+
+    &amp;para1;
+    &amp;para2;
+    &amp;para3;
+  &lt;/body&gt;
+&lt;/html&gt;</programlisting>
 	  </step>
 
 	  <step>
@@ -1268,24 +1268,24 @@ example.xml:5: element head: validity er
 	    <para>Edit <filename>example.xml</filename> so that it
 	      looks like this:</para>
 
-	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	    <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!ENTITY % entities SYSTEM "entities.ent"> %entities;
-]>
+&lt;!ENTITY % entities SYSTEM "entities.ent"&gt; %entities;
+]&gt;
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>An Example XHTML File</title>
-  </head>
-
-  <body>
-    <p>The current version of this document is: &version;</p>
-
-    &para1;
-    &para2;
-    &para3;
-  </body>
-</html>]]></programlisting>
+&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
+  &lt;head&gt;
+    &lt;title&gt;An Example XHTML File&lt;/title&gt;
+  &lt;/head&gt;
+
+  &lt;body&gt;
+    &lt;p&gt;The current version of this document is: &amp;version;&lt;/p&gt;
+
+    &amp;para1;
+    &amp;para2;
+    &amp;para3;
+  &lt;/body&gt;
+&lt;/html&gt;</programlisting>
 	  </step>
 
 	  <step>