From 97871b773d8a2ca20b0a7f329604863f0b9f6c96 Mon Sep 17 00:00:00 2001
From: Timothy Bauscher <timothy@linuxfromscratch.org>
Date: Fri, 17 Jan 2003 03:56:38 +0000
Subject: Procinfo conversion.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2371 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendixa/procinfo-dep.xml       |  2 ++
 appendixa/procinfo-desc.xml      |  9 ++++-----
 appendixa/procinfo-shortdesc.xml | 15 +++++++++++++++
 appendixa/procinfo.xml           |  1 +
 chapter06/procinfo-inst.xml      | 15 ++++++++++++---
 chapter06/procinfo.xml           |  5 ++---
 entities/procinfo.ent            |  2 +-
 7 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 appendixa/procinfo-shortdesc.xml

diff --git a/appendixa/procinfo-dep.xml b/appendixa/procinfo-dep.xml
index 8ffb15c03..b33dc7a84 100644
--- a/appendixa/procinfo-dep.xml
+++ b/appendixa/procinfo-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Procinfo Installation Dependencies</title>
 
diff --git a/appendixa/procinfo-desc.xml b/appendixa/procinfo-desc.xml
index 187d4723c..4c3da431e 100644
--- a/appendixa/procinfo-desc.xml
+++ b/appendixa/procinfo-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Procinfo</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &procinfo-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>lsdev, procinfo and socklist</para></sect3>
+<para>Last checked against version &procinfo-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>lsdev</title>
 <para>lsdev gathers information about your computer's installed hardware from
diff --git a/appendixa/procinfo-shortdesc.xml b/appendixa/procinfo-shortdesc.xml
new file mode 100644
index 000000000..8e897e57a
--- /dev/null
+++ b/appendixa/procinfo-shortdesc.xml
@@ -0,0 +1,15 @@
+<sect2><title>Contents of Procinfo</title>
+
+<para>Last checked against version &procinfo-contversion;.</para>
+
+<para>The procinfo program gathers system data, such as memory
+usage and IRQ numbers, from the <filename>/proc</filename>
+directory and formats this data in a meaningful way.</para>
+
+<para>Procinfo installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>lsdev, procinfo and socklist</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/procinfo.xml b/appendixa/procinfo.xml
index 7cdcc6bd4..f8ff84cca 100644
--- a/appendixa/procinfo.xml
+++ b/appendixa/procinfo.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="procinfo.html" dir="appendixa"?>
 
 &aa-procinfo-down;
+&aa-procinfo-shortdesc;
 &aa-procinfo-desc;
 &aa-procinfo-dep;
 
diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml
index fde7a6653..40a0030fc 100644
--- a/chapter06/procinfo-inst.xml
+++ b/chapter06/procinfo-inst.xml
@@ -1,10 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Procinfo</title>
 
-<para>Install Procinfo by running the following commands:</para>
+<para>Compile Procinfo:</para>
+
+<para><screen><userinput>make LDLIBS=-lncurses</userinput></screen></para>
+
+<para>The <emphasis>-lncurses</emphasis> switch overwrites the
+default switch, <emphasis>-ltermcap</emphasis>. This is done
+because libtermcap is declared obsolete in favor of libncurses.</para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>make LDLIBS=-lncurses &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml
index 729110829..70eabfca6 100644
--- a/chapter06/procinfo.xml
+++ b/chapter06/procinfo.xml
@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &procinfo-time;
 Estimated required disk space:  &procinfo-compsize;</screen>
 
-&c6-procinfo-inst;
-&c6-procinfo-exp;
-&aa-procinfo-desc;
+&aa-procinfo-shortdesc;
 &aa-procinfo-dep;
+&c6-procinfo-inst;
 
 </sect1>
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
index bc447c93e..8358920a2 100644
--- a/entities/procinfo.ent
+++ b/entities/procinfo.ent
@@ -1,13 +1,13 @@
 <!ENTITY c4-procinfo SYSTEM "../chapter04/procinfo.xml">
 
 <!ENTITY c6-procinfo SYSTEM "../chapter06/procinfo.xml">
-<!ENTITY c6-procinfo-exp SYSTEM "../chapter06/procinfo-exp.xml">
 <!ENTITY c6-procinfo-inst SYSTEM "../chapter06/procinfo-inst.xml">
 
 <!ENTITY aa-procinfo SYSTEM "../appendixa/procinfo.xml">
 <!ENTITY aa-procinfo-desc SYSTEM "../appendixa/procinfo-desc.xml">
 <!ENTITY aa-procinfo-dep SYSTEM "../appendixa/procinfo-dep.xml">
 <!ENTITY aa-procinfo-down SYSTEM "../appendixa/procinfo-down.xml">
+<!ENTITY aa-procinfo-shortdesc SYSTEM "../appendixa/procinfo-shortdesc.xml">
 
 <!ENTITY procinfo-version "18">
 <!ENTITY procinfo-depversion "18">
-- 
cgit v1.2.3-54-g00ecf