aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Bauscher <timothy@linuxfromscratch.org>2003-01-17 01:14:19 +0000
committerTimothy Bauscher <timothy@linuxfromscratch.org>2003-01-17 01:14:19 +0000
commite9e4e6909afbadd9a3e5f919de3d61fdd16605b3 (patch)
tree0c97d0b32b868d8655de5fa9877485defdf7079a
parent966ae10ce6e7c8f6e43f4497da5b587d42b05d99 (diff)
Billy's file conversion.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2358 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--appendixa/file-dep.xml2
-rw-r--r--appendixa/file-desc.xml9
-rw-r--r--appendixa/file-shortdesc.xml13
-rw-r--r--chapter06/file-inst.xml18
-rw-r--r--chapter06/file.xml4
-rw-r--r--entities/file.ent2
6 files changed, 37 insertions, 11 deletions
diff --git a/appendixa/file-dep.xml b/appendixa/file-dep.xml
index 76adf2e87..93f573a07 100644
--- a/appendixa/file-dep.xml
+++ b/appendixa/file-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>File Installation Dependencies</title>
diff --git a/appendixa/file-desc.xml b/appendixa/file-desc.xml
index a528fee4e..892e49238 100644
--- a/appendixa/file-desc.xml
+++ b/appendixa/file-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of File</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<para>Last checked against version &file-contversion;.</para>
+<sect2><title>Descriptions</title>
-<sect3><title>Program Files</title>
-<para>file</para></sect3>
+<para>Last checked against version &file-contversion;.</para>
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
<sect4><title>file</title>
<para>file tests each specified file in an attempt to classify it. There are
diff --git a/appendixa/file-shortdesc.xml b/appendixa/file-shortdesc.xml
new file mode 100644
index 000000000..8b1608fbd
--- /dev/null
+++ b/appendixa/file-shortdesc.xml
@@ -0,0 +1,13 @@
+<sect2><title>Contents of File</title>
+
+<para>Last checked against version &file-contversion;.</para>
+
+<para>File is a utility used to determine file types.</para>
+
+<para>File installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>file</para></sect3>
+
+</sect2>
+
diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml
index a985f51b6..a8e9fea6e 100644
--- a/chapter06/file-inst.xml
+++ b/chapter06/file-inst.xml
@@ -1,11 +1,21 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of File</title>
-<para>Install File by running the following commands:</para>
+<para>Prepare File to be compiled:</para>
+
+<para><screen><userinput>
+./configure --prefix=/usr --datadir=/usr/share/misc
+</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
-<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 974f27630..db2ada676 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -5,9 +5,9 @@
<screen>Estimated build time: &file-time;
Estimated required disk space: &file-compsize;</screen>
-&c6-file-inst;
-&aa-file-desc;
+&aa-file-shortdesc;
&aa-file-dep;
+&c6-file-inst;
</sect1>
diff --git a/entities/file.ent b/entities/file.ent
index db5c381c1..1b457d78d 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -4,6 +4,8 @@
<!ENTITY c6-file-inst SYSTEM "../chapter06/file-inst.xml">
<!ENTITY aa-file SYSTEM "../appendixa/file.xml">
+<!ENTITY aa-file-shortdesc SYSTEM "../appendixa/file-shortdesc.xml">
+
<!ENTITY aa-file-desc SYSTEM "../appendixa/file-desc.xml">
<!ENTITY aa-file-dep SYSTEM "../appendixa/file-dep.xml">
<!ENTITY aa-file-down SYSTEM "../appendixa/file-down.xml">