aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/procps-dep.xml2
-rw-r--r--appendixa/procps-desc.xml15
-rw-r--r--appendixa/procps-shortdesc.xml19
-rw-r--r--appendixa/procps.xml1
-rw-r--r--chapter06/procps-inst.xml24
-rw-r--r--chapter06/procps.xml5
-rw-r--r--entities/procps.ent2
7 files changed, 49 insertions, 19 deletions
diff --git a/appendixa/procps-dep.xml b/appendixa/procps-dep.xml
index 99641bd7e..bfa0a6ba1 100644
--- a/appendixa/procps-dep.xml
+++ b/appendixa/procps-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Procps Installation Dependencies</title>
diff --git a/appendixa/procps-desc.xml b/appendixa/procps-desc.xml
index a47d48f14..b621ea002 100644
--- a/appendixa/procps-desc.xml
+++ b/appendixa/procps-desc.xml
@@ -1,12 +1,10 @@
-<sect2><title>Contents of Procps</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<para>Last checked against version &procps-contversion;.</para>
+<sect2><title>Descriptions</title>
-<sect3><title>Program Files</title>
-<para>free, kill, oldps, pgrep, pkill, ps, skill, snice, sysctl, tload, top,
-vmstat, w and watch</para></sect3>
+<para>Last checked against version &procps-contversion;.</para>
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
<sect4><title>free</title>
<para>free displays the total amount of free and used physical and swap memory
@@ -58,10 +56,7 @@ screen full).</para></sect4>
</sect3>
-<sect3><title>Library Files</title>
-<para>libproc.so</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
<sect4><title>libproc</title>
<para>libproc is the library against which most of the programs in this
diff --git a/appendixa/procps-shortdesc.xml b/appendixa/procps-shortdesc.xml
new file mode 100644
index 000000000..0bbff8aa3
--- /dev/null
+++ b/appendixa/procps-shortdesc.xml
@@ -0,0 +1,19 @@
+<sect2><title>Contents of Procps</title>
+
+<para>Last checked against version &procps-contversion;.</para>
+
+<para>The Procps package provides programs to monitor and
+hault system processes. Procps gathers information about
+processes via the <filename>/proc</filename> directory.</para>
+
+<para>Procps installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>free, kill, oldps, pgrep, pkill, ps, skill, snice, sysctl, tload, top,
+vmstat, w and watch</para></sect3>
+
+<sect3><title>Library Files</title>
+<para>libproc.so</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/procps.xml b/appendixa/procps.xml
index 1b626fdc4..941c23991 100644
--- a/appendixa/procps.xml
+++ b/appendixa/procps.xml
@@ -3,6 +3,7 @@
<?dbhtml filename="procps.html" dir="appendixa"?>
&aa-procps-down;
+&aa-procps-shortdesc;
&aa-procps-desc;
&aa-procps-dep;
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
index a487f79d9..619457799 100644
--- a/chapter06/procps-inst.xml
+++ b/chapter06/procps-inst.xml
@@ -1,14 +1,28 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Procps</title>
<para>This package requires its patch to be applied before you can
-install it.</para>
+install it. This patch fixes a locale problem that makes
+<userinput>w</userinput> crash under certain locale settings. Apply
+the patch:</para>
+
+<para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch</userinput></screen></para>
+
+<para>Compile Procps:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
-<para>Install Procps by running the following commands:</para>
+<para><screen><userinput>make XSCPT="" install</userinput></screen></para>
-<para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch &amp;&amp;
-make &amp;&amp;
-make XSCPT="" install</userinput></screen></para>
+<para>The <emphasis>XSCPT</emphasis> option will set the Makefile
+variable XSCPT to an empty value so that XConsole installation is
+disabled. Otherwise, <userinput>make install</userinput> tries to
+copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. That
+directory does not exist because X is not installed.</para>
</sect2>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 308d9df58..eb28a8f76 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -5,9 +5,8 @@
<screen>Estimated build time: &procps-time;
Estimated required disk space: &procps-compsize;</screen>
-&c6-procps-inst;
-&c6-procps-exp;
-&aa-procps-desc;
+&aa-procps-shortdesc;
&aa-procps-dep;
+&c6-procps-inst;
</sect1>
diff --git a/entities/procps.ent b/entities/procps.ent
index 1b124ebb6..d2a06a4aa 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -3,12 +3,12 @@
<!ENTITY c6-procps SYSTEM "../chapter06/procps.xml">
<!ENTITY c6-procps-inst SYSTEM "../chapter06/procps-inst.xml">
-<!ENTITY c6-procps-exp SYSTEM "../chapter06/procps-exp.xml">
<!ENTITY aa-procps SYSTEM "../appendixa/procps.xml">
<!ENTITY aa-procps-desc SYSTEM "../appendixa/procps-desc.xml">
<!ENTITY aa-procps-dep SYSTEM "../appendixa/procps-dep.xml">
<!ENTITY aa-procps-down SYSTEM "../appendixa/procps-down.xml">
+<!ENTITY aa-procps-shortdesc SYSTEM "../appendixa/procps-shortdesc.xml">
<!ENTITY procps-version "3.1.5">
<!ENTITY procps-depversion "2.0.7">