* Merged newxml into HEAD

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

1 files changed, 45 insertions, 12 deletions

diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index f506ed5b8..2378d60ff 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -1,17 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-system-psmisc" xreflabel="Psmisc">
-<title>Installing Psmisc-&psmisc-version;</title>
-<?dbhtml filename="psmisc.html" dir="chapter06"?>
+<title>Psmisc-&psmisc-version;</title>
+<?dbhtml filename="psmisc.html"?>
+
+<indexterm zone="ch-system-psmisc"><primary sortas="a-Psmisc">Psmisc</primary></indexterm>
 
 <para>The Psmisc package contains programs for displaying information on
 processes.</para>
 
-<screen>&buildtime; &psmisc-time;
-&diskspace; &psmisc-compsize;</screen>
+<screen>&buildtime; 0.1 SBU
+&diskspace; 2.2 MB</screen>
+
+<para>Psmisc installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed.</para>
 
-&aa-psmisc-down;
-&aa-psmisc-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Psmisc</title>
@@ -24,7 +31,7 @@ processes.</para>
 
 <itemizedlist>
 <listitem><para><userinput>--exec-prefix=/</userinput>: This causes the
-binaries to be installed in <filename>/bin</filename> and not in
+binaries to be installed in <filename>/bin</filename> instead of
 <filename>/usr/bin</filename>. As the Psmisc programs are often used in
 bootscripts, they should be available also when the <filename>/usr</filename>
 file system isn't mounted.</para></listitem>
@@ -34,7 +41,7 @@ file system isn't mounted.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
-<para>And install it:</para>
+<para>Now install it:</para>
 
 <screen><userinput>make install</userinput></screen>
 
@@ -58,8 +65,34 @@ creating the following symlink:</para>
 
 </sect2>
 
-&aa-psmisc-shortdesc;
-&aa-psmisc-desc;
 
-</sect1>
+<sect2 id="contents-psmisc"><title>Contents of Psmisc</title>
+
+<para><emphasis>Installed programs</emphasis>: fuser, killall, pstree and
+pstree.x11 (link to pstree)</para>
+
+</sect2>
+
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-psmisc fuser"><primary sortas="b-fuser">fuser</primary></indexterm>
+<para id="fuser"><command>fuser</command> reports the PIDs of processes that use
+the given files or file systems.</para>
 
+<indexterm zone="ch-system-psmisc killall"><primary sortas="b-killall">killall</primary></indexterm>
+<para id="killall"><command>killall</command> kills processes by name. It sends a signal
+to all processes running any of the given commands.</para>
+
+<indexterm zone="ch-system-psmisc pstree"><primary sortas="b-pstree">pstree</primary></indexterm>
+<para id="pstree"><command>pstree</command> displays running processes as a tree.</para>
+
+<indexterm zone="ch-system-psmisc pstree.x11"><primary sortas="b-pstree.x11">pstree.x11</primary></indexterm>
+<para id="pstree.x11"><command>pstree.x11</command> same as pstree except that it waits for
+confirmation before exiting.</para>
+
+</sect2>
+
+
+
+</sect1>