Psmisc conversion.

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

7 files changed, 44 insertions, 15 deletions

diff --git a/appendixa/psmisc-dep.xml b/appendixa/psmisc-dep.xml
index 4294472f7..d624b2a37 100644
--- a/appendixa/psmisc-dep.xml
+++ b/appendixa/psmisc-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Psmisc Installation Dependencies</title>
 
diff --git a/appendixa/psmisc-desc.xml b/appendixa/psmisc-desc.xml
index fc245ccfd..6e1318d95 100644
--- a/appendixa/psmisc-desc.xml
+++ b/appendixa/psmisc-desc.xml
@@ -1,14 +1,13 @@
-<sect2><title>Contents of Psmisc</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Descriptions</title>
 
 <para>Last checked against version &psmisc-contversion;.</para>
 
-<sect3><title>Program Files</title>
-<para>fuser, killall and pstree</para>
+<sect3><title>Program file descriptions</title>
 
 <para>Note that in LFS we don't install the pidof link by default
-because we use pidof from sysvinit instead.</para></sect3>
-
-<sect3><title>Descriptions</title>
+because we use pidof from sysvinit instead.</para>
 
 <sect4><title>fuser</title>
 <para>fuser displays the PIDs of processes that use the specified
diff --git a/appendixa/psmisc-shortdesc.xml b/appendixa/psmisc-shortdesc.xml
new file mode 100644
index 000000000..4e2aa9599
--- /dev/null
+++ b/appendixa/psmisc-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of Psmisc</title>
+
+<para>Last checked against version &psmisc-contversion;.</para>
+
+<para>The Psmisc package contains three programs which help
+manage the <filename>/proc</filename> directory.</para>
+
+<para>Psmisc installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>fuser, killall and pstree</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/psmisc.xml b/appendixa/psmisc.xml
index 952400546..4dfd53838 100644
--- a/appendixa/psmisc.xml
+++ b/appendixa/psmisc.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="psmisc.html" dir="appendixa"?>
 
 &aa-psmisc-down;
+&aa-psmisc-shortdesc;
 &aa-psmisc-desc;
 &aa-psmisc-dep;
 
diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml
index ee406e301..eabaa85ab 100644
--- a/chapter06/psmisc-inst.xml
+++ b/chapter06/psmisc-inst.xml
@@ -1,11 +1,25 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Psmisc</title>
 
-<para>Install Psmisc by running the following commands:</para>
+<para>Prepare Psmic to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/</userinput></screen></para>
+
+<para>The <emphasis>--exec-prefix=/</emphasis> flag will cause the
+programs to be installed in /bin rather than in /usr/bin. The programs
+in this package are often used in bootscripts; they should be in the /bin
+directory so they can be used in the event that the <filename
+class="directory">/usr</filename> partition isn't mounted.</para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/ &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 <para>Psmisc's pidof program isn't installed by default. Generally, this
 isn't a problem because we later install the Sysvinit package, which
@@ -14,7 +28,7 @@ provides a better pidof program.</para>
 <para>It's up to you to decide if you are going to use the Sysvinit 
 package, which provides a pidof program, or not. If you're not going to
 use Sysvinit, you should complete this package's installation by creating
-the <filename>/bin/pidof</filename> symlink by running:</para>
+the <filename>/bin/pidof</filename> symlink:</para>
 
 <para><screen><userinput>ln -s killall /bin/pidof</userinput></screen></para>
 
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 0f0d8cc2b..e2a9d6c6e 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &psmisc-time;
 Estimated required disk space:  &psmisc-compsize;</screen>
 
-&c6-psmisc-inst;
-&c6-psmisc-exp;
-&aa-psmisc-desc;
+&aa-psmisc-shortdesc;
 &aa-psmisc-dep;
+&c6-psmisc-inst;
 
 </sect1>
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
index b4b881546..26970303f 100644
--- a/entities/psmisc.ent
+++ b/entities/psmisc.ent
@@ -2,12 +2,12 @@
 
 <!ENTITY c6-psmisc SYSTEM "../chapter06/psmisc.xml">
 <!ENTITY c6-psmisc-inst SYSTEM "../chapter06/psmisc-inst.xml">
-<!ENTITY c6-psmisc-exp SYSTEM "../chapter06/psmisc-exp.xml">
 
 <!ENTITY aa-psmisc SYSTEM "../appendixa/psmisc.xml">
 <!ENTITY aa-psmisc-desc SYSTEM "../appendixa/psmisc-desc.xml">
 <!ENTITY aa-psmisc-dep SYSTEM "../appendixa/psmisc-dep.xml">
 <!ENTITY aa-psmisc-down SYSTEM "../appendixa/psmisc-down.xml">
+<!ENTITY aa-psmisc-shortdesc SYSTEM "../appendixa/psmisc-shortdesc.xml">
 
 <!ENTITY psmisc-version "21.2">
 <!ENTITY psmisc-depversion "20.2">