Netkit-base conversion.

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

7 files changed, 46 insertions, 15 deletions

diff --git a/appendixa/netkitbase-dep.xml b/appendixa/netkitbase-dep.xml
index f05707d0f..c85b7c0c6 100644
--- a/appendixa/netkitbase-dep.xml
+++ b/appendixa/netkitbase-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Netkit-base Installation Dependencies</title>
 
diff --git a/appendixa/netkitbase-desc.xml b/appendixa/netkitbase-desc.xml
index 44cf5489f..2e630d130 100644
--- a/appendixa/netkitbase-desc.xml
+++ b/appendixa/netkitbase-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Netkit-base</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &netkit-base-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>inetd and ping</para></sect3>
+<para>Last checked against version &netkit-base-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>inetd</title>
 <para>inetd is the mother of all daemons. It listens for connections and 
diff --git a/appendixa/netkitbase-shortdesc.xml b/appendixa/netkitbase-shortdesc.xml
new file mode 100644
index 000000000..939221b74
--- /dev/null
+++ b/appendixa/netkitbase-shortdesc.xml
@@ -0,0 +1,16 @@
+<sect2><title>Contents of Netkit-base</title>
+
+<para>Last checked against version &netkit-base-contversion;.</para>
+
+<para>The Netkit-base package contains two network-related
+tools: ping, which determines the response time of ICMP packets,
+and the inet daemon, which listens for port requests and assigns
+these requests to the appropriate programs.</para>
+
+<para>Netkit-base installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>inetd and ping</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/netkitbase.xml b/appendixa/netkitbase.xml
index f7b749d32..9e144e704 100644
--- a/appendixa/netkitbase.xml
+++ b/appendixa/netkitbase.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="netkit-base.html" dir="appendixa"?>
 
 &aa-netkitbase-down;
+&aa-netkitbase-shortdesc;
 &aa-netkitbase-desc;
 &aa-netkitbase-dep;
 
diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml
index 7729d82d3..ccf979b87 100644
--- a/chapter06/netkitbase-inst.xml
+++ b/chapter06/netkitbase-inst.xml
@@ -1,16 +1,28 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Netkit-base</title>
 
-<para>Install Netkit-base by running the following commands:</para>
+<para>Prepare Netkit-base to be compiled:</para>
+
+<para><screen><userinput>./configure</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Finally, two essential config files need to be installed in
+the <filename class="directory">/etc</filename> directory. There are
+other files in the <filename class="directory">etc.sample</filename>
+directory which might be of interest to you.</para>
 
-<para><screen><userinput>./configure &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-cp etc.sample/{services,protocols} /etc</userinput></screen></para>
+<para>Complete the installation of this package:</para>
 
-<para>There are other files in the <filename
-class="directory">etc.sample</filename> directory which might be of
-interest to you.</para>
+<para><screen><userinput>cp etc.sample/{services,protocols} /etc</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/netkitbase.xml b/chapter06/netkitbase.xml
index 1e8acf92f..ce43ebd7c 100644
--- a/chapter06/netkitbase.xml
+++ b/chapter06/netkitbase.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &netkit-base-time;
 Estimated required disk space:  &netkit-base-compsize;</screen>
 
-&c6-netkitbase-inst;
-&aa-netkitbase-desc;
+&aa-netkitbase-shortdesc;
 &aa-netkitbase-dep;
+&c6-netkitbase-inst;
 
 </sect1>
 
diff --git a/entities/netkitbase.ent b/entities/netkitbase.ent
index 7317163ce..082ff4e64 100644
--- a/entities/netkitbase.ent
+++ b/entities/netkitbase.ent
@@ -7,6 +7,7 @@
 <!ENTITY aa-netkitbase-desc SYSTEM "../appendixa/netkitbase-desc.xml">
 <!ENTITY aa-netkitbase-dep SYSTEM "../appendixa/netkitbase-dep.xml">
 <!ENTITY aa-netkitbase-down SYSTEM "../appendixa/netkitbase-down.xml">
+<!ENTITY aa-netkitbase-shortdesc SYSTEM "../appendixa/netkitbase-shortdesc.xml">
 
 <!ENTITY netkit-base-version "0.17">
 <!ENTITY netkit-base-depversion "0.17">