Index: BOOK/final-system/mips64/make.xml
===================================================================
--- BOOK/final-system/mips64/make.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/make.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/make.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/mktemp.xml
===================================================================
--- BOOK/final-system/mips64/mktemp.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/mktemp.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/mktemp.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/module-init-tools.xml
===================================================================
--- BOOK/final-system/mips64/module-init-tools.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/module-init-tools.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/module-init-tools.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/procps-64bit.xml
===================================================================
--- BOOK/final-system/mips64/procps-64bit.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/procps-64bit.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/procps.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/procps-n32.xml
===================================================================
--- BOOK/final-system/mips64/procps-n32.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/procps-n32.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -18,26 +18,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/procps.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/procps.xml
===================================================================
--- BOOK/final-system/mips64/procps.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/procps.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -18,26 +18,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/procps.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/sysvinit.xml
===================================================================
--- BOOK/final-system/mips64/sysvinit.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/sysvinit.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/mips64/util-linux.xml
===================================================================
--- BOOK/final-system/mips64/util-linux.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/mips64/util-linux.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc/hfsutils.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/ppc/hfsutils.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -24,14 +24,4 @@
 
     <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <segmentedlist>
       <segtitle>&dependencies;</segtitle>
 
Index: BOOK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/ppc/linux-libc-headers.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/ppc/linux-libc-headers.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/ppc/parted.xml
===================================================================
--- BOOK/final-system/ppc/parted.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/ppc/parted.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -24,14 +24,4 @@
     in that, unlike <command>fdisk</command>, it accurately reads Macintosh
     partition maps.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
Index: BOOK/final-system/ppc/patch.xml
===================================================================
--- BOOK/final-system/ppc/patch.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/ppc/patch.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patch.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/ppc/powerpc-utils.xml
===================================================================
--- BOOK/final-system/ppc/powerpc-utils.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/ppc/powerpc-utils.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -24,14 +24,4 @@
     obsolete, but <command>nvsetenv</command> is needed by <command>ybin</command>
     to install the bootloader on an hfs partition.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
Index: BOOK/final-system/ppc/yaboot.xml
===================================================================
--- BOOK/final-system/ppc/yaboot.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/ppc/yaboot.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -22,14 +22,4 @@
     <para>The Yaboot package contains a PowerPC Boot Loader for machines using
     OpenFirmware such as NewWorld Macintoshes.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
@@ -83,11 +73,11 @@
       <varlistentry id="addnote">
         <term><command>addnote</command></term>
-	<listitem>
-	  <para>For IBM CHRP machines, add a PT_NOTE program header
-	  entry to an elf file so that it can be booted.</para>
-	  <indexterm zone="ch-system-yaboot addnote">
-	    <primary sortas="b-addnote">addnote</primary>
-	  </indexterm>
-	</listitem>
+  <listitem>
+    <para>For IBM CHRP machines, add a PT_NOTE program header
+    entry to an elf file so that it can be booted.</para>
+    <indexterm zone="ch-system-yaboot addnote">
+      <primary sortas="b-addnote">addnote</primary>
+    </indexterm>
+  </listitem>
       </varlistentry>
 
@@ -107,5 +97,5 @@
         <listitem>
           <para>Script to format the boot menu using yaboot.conf and
-	  write the resulting OpenFirmware code to the bootstrap.</para>
+    write the resulting OpenFirmware code to the bootstrap.</para>
           <indexterm zone="ch-system-yaboot ofboot">
             <primary sortas="b-ofboot">ofboot</primary>
@@ -118,5 +108,5 @@
         <listitem>
           <para>Determine OpenFirmware path corresponding to a device
-	  node.</para>
+    node.</para>
           <indexterm zone="ch-system-yaboot ofpath">
             <primary sortas="b-ofpath">ofpath</primary>
@@ -149,5 +139,5 @@
         <listitem>
           <para>Shell script to update or install the boot loader
-	  on a bootstrap partition.</para>
+    on a bootstrap partition.</para>
           <indexterm zone="ch-system-yaboot ybin">
             <primary sortas="b-ybin">ybin</primary>
@@ -160,5 +150,5 @@
         <listitem>
           <para>Configuration file used by <command>ybin</command> to determine
-	  how to install <command>yaboot</command> on the bootstrap partition.</para>
+    how to install <command>yaboot</command> on the bootstrap partition.</para>
           <indexterm zone="ch-system-yaboot yaboot.conf">
             <primary sortas="e-yaboot.conf">yaboot.conf</primary>
Index: BOOK/final-system/sparc/binutils.xml
===================================================================
--- BOOK/final-system/sparc/binutils.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/binutils.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/binutils.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc/elftoaout.xml
===================================================================
--- BOOK/final-system/sparc/elftoaout.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/elftoaout.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -21,14 +21,4 @@
 
     <para>The ELFtoaout package contains the Sparc ELF to a.out converter.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
Index: BOOK/final-system/sparc/glibc.xml
===================================================================
--- BOOK/final-system/sparc/glibc.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/glibc.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc/kbd.xml
===================================================================
--- BOOK/final-system/sparc/kbd.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/kbd.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/kbd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc/linux-libc-headers.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/linux-libc-headers.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc/silo.xml
===================================================================
--- BOOK/final-system/sparc/silo.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/silo.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -21,14 +21,4 @@
 
     <para>The Silo package contains the Sparc Improved boot LOader.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
Index: BOOK/final-system/sparc/sysvinit.xml
===================================================================
--- BOOK/final-system/sparc/sysvinit.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc/sysvinit.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/binutils.xml
===================================================================
--- BOOK/final-system/sparc64/binutils.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/binutils.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/binutils.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/elftoaout.xml
===================================================================
--- BOOK/final-system/sparc64/elftoaout.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/elftoaout.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/elftoaout.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/elftoaout.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/glibc.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -18,26 +18,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/kbd.xml
===================================================================
--- BOOK/final-system/sparc64/kbd.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/kbd.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/kbd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-libc-headers.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/linux-libc-headers.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/silo.xml
===================================================================
--- BOOK/final-system/sparc64/silo.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/silo.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: BOOK/final-system/sparc64/sysvinit.xml
===================================================================
--- BOOK/final-system/sparc64/sysvinit.xml	(revision 663c5a655d71cb04704a5fe73805bf08d3bbcedd)
+++ BOOK/final-system/sparc64/sysvinit.xml	(revision 0babf98ca48a24f3d7de74a95ed46685af8c3ee0)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
