Correct some invalid XML spotted by jing

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/LFS-RNG/BOOK@4388 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 23 insertions, 21 deletions

diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index a4d605513..8de6ef0c1 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 [
+<!DOCTYPE section [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-expect" xreflabel="Expect" role="wrap">
+<section xmlns="http://docbook.org/docbook-ng"
+         xml:id="ch-tools-expect" xreflabel="Expect" role="wrap">
 <title>Expect-&expect-version;</title>
 <?dbhtml filename="expect.html"?>
 
 <indexterm zone="ch-tools-expect"><primary sortas="a-Expect">Expect</primary></indexterm>
 
-<sect2 role="package"><title/>
+<section role="package"><title/>
 <para>The Expect package contains a program for carrying out scripted dialogues
 with other interactive programs.</para>
 
@@ -24,9 +25,9 @@ with other interactive programs.</para>
 <seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Sed, Tcl</seg></seglistitem>
 </segmentedlist>
-</sect2>
+</section>
 
-<sect2 role="installation">
+<section role="installation">
 <title>Installation of Expect</title>
 
 <para>First fix a bug that can result in bogus failures during the GCC test
@@ -83,10 +84,10 @@ of the supplementary expect scripts which are not needed.</para></listitem>
 
 <para>You can now remove the source directories of both Tcl and Expect.</para>
 
-</sect2>
+</section>
 
 
-<sect2 id="contents-expect" role="content"><title>Contents of Expect</title>
+<section xml:id="contents-expect" role="content"><title>Contents of Expect</title>
 
 <segmentedlist>
 <segtitle>Installed program</segtitle>
@@ -96,7 +97,7 @@ of the supplementary expect scripts which are not needed.</para></listitem>
 
 <variablelist><title>Short description</title>
 
-<varlistentry id="expect">
+<varlistentry xml:id="expect">
 <term><command>expect</command></term>
 <listitem>
 <indexterm zone="ch-tools-expect expect"><primary sortas="b-expect">expect</primary></indexterm>
@@ -105,7 +106,7 @@ programs according to a script.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry id="libexpect">
+<varlistentry xml:id="libexpect">
 <term><filename class="libraryfile">libexpect-5.42.a</filename></term>
 <listitem>
 <para>contains functions that allow Expect to be used as a Tcl extension or to
@@ -116,7 +117,7 @@ sortas="c-libexpect-5.42">libexpect-5.42</primary></indexterm>
 </varlistentry>
 </variablelist>
 
-</sect2>
+</section>
 
 
-</sect1>
+</section>
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index a53a4f06e..ebc86220f 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 [
+<!DOCTYPE section [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sed" xreflabel="Sed" role="wrap">
+<section xmlns="http://docbook.org/docbook-ng"
+         xml:id="ch-system-sed" xreflabel="Sed" role="wrap">
 <title>Sed-&sed-version;</title>
 <?dbhtml filename="sed.html"?>
 
 <indexterm zone="ch-system-sed"><primary sortas="a-Sed">Sed</primary></indexterm>
 
-<sect2 role="package"><title/>
+<section role="package"><title/>
 <para>The Sed package contains a stream editor.</para>
 
 <segmentedlist>
@@ -23,9 +24,9 @@
 <seglistitem><seg>Bash, Binutils, Coreutils,
 Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
 </segmentedlist>
-</sect2>
+</section>
 
-<sect2 role="installation">
+<section role="installation">
 <title>Installation of Sed</title>
 
 <para>Prepare Sed for compilation:</para>
@@ -43,10 +44,10 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+</section>
 
 
-<sect2 id="contents-sed" role="content"><title>Contents of Sed</title>
+<section xml:id="contents-sed" role="content"><title>Contents of Sed</title>
 
 <segmentedlist>
 <segtitle>Installed program</segtitle>
@@ -55,7 +56,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
 
 <variablelist><title>Short descriptions</title>
 
-<varlistentry id="sed">
+<varlistentry xml:id="sed">
 <term><command>sed</command></term>
 <listitem>
 <indexterm zone="ch-system-sed sed"><primary sortas="b-sed">sed</primary></indexterm>
@@ -64,8 +65,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
 </varlistentry>
 </variablelist>
 
-</sect2>
+</section>
 
 
 
-</sect1>
+</section>