Index: BOOK/testsuite-tools/alpha-chapter.xml
===================================================================
--- BOOK/testsuite-tools/alpha-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/alpha-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/common/file.xml
===================================================================
--- BOOK/testsuite-tools/common/file.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The File package contains a utility for determining the type of
-    a given file or files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para os="a">Prepare File for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Now we create a symlink so that the GCC testsuite
-    can use <command>file</command>:</para>
-
-<screen os="i"><userinput>ln -sv /tools/bin/file /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/testsuite-tools/mips-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/mips-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/mips/file.xml
===================================================================
--- BOOK/testsuite-tools/mips/file.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of file</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/file.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/file.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-</sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/testsuite-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/mips64-64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/mips64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/mips64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
Index: BOOK/testsuite-tools/mips64/file-64bit.xml
===================================================================
--- BOOK/testsuite-tools/mips64/file-64bit.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-file" role="wrap">
-  <?dbhtml filename="file-64bit.html"?>
-
-  <title>File-&file-version; 64 Bit</title>
-
-  <indexterm zone="ch-testsuite-tools-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/file.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/file.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/file-64bit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/testsuite-tools/multilib/file-64bit.xml
===================================================================
--- BOOK/testsuite-tools/multilib/file-64bit.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-file" role="wrap">
-  <?dbhtml filename="file-64bit.html"?>
-
-  <title>File-&file-version; 64 Bit</title>
-
-  <indexterm zone="ch-testsuite-tools-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --libdir=/tools/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/testsuite-tools/ppc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/ppc-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/ppc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/ppc64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
Index: BOOK/testsuite-tools/sparc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/sparc-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/sparc64-64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/sparc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/sparc64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
Index: BOOK/testsuite-tools/x86-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/x86-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/x86_64-64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/x86_64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-chapter.xml	(revision 45bf79c2214ec7757d27cd27c87127a4176ac201)
+++ BOOK/testsuite-tools/x86_64-chapter.xml	(revision db121c2ee39853954169b6bcf2dcd61eab1150b9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
