aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/modutils-dep.xml2
-rw-r--r--appendixa/modutils-desc.xml11
-rw-r--r--appendixa/modutils-shortdesc.xml16
-rw-r--r--appendixa/modutils.xml1
-rw-r--r--chapter06/modutils-inst.xml16
-rw-r--r--chapter06/modutils.xml4
-rw-r--r--entities/modutils.ent1
7 files changed, 38 insertions, 13 deletions
diff --git a/appendixa/modutils-dep.xml b/appendixa/modutils-dep.xml
index e942ae4fa..96e018958 100644
--- a/appendixa/modutils-dep.xml
+++ b/appendixa/modutils-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Modutils Installation Dependencies</title>
diff --git a/appendixa/modutils-desc.xml b/appendixa/modutils-desc.xml
index 749bd78d4..e4ac0f7f9 100644
--- a/appendixa/modutils-desc.xml
+++ b/appendixa/modutils-desc.xml
@@ -1,13 +1,10 @@
-<sect2><title>Contents of Modutils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<para>Last checked against version &modutils-contversion;.</para>
+<sect2><title>Descriptions</title>
-<sect3><title>Program Files</title>
-<para>depmod, genksyms, insmod, insmod_ksymoops_clean, kallsyms (link to
-insmod), kernelversion, ksyms (link to insmod), lsmod (link to insmod),
-modinfo, modprobe (link to insmod) and rmmod (link to insmod)</para></sect3>
+<para>Last checked against version &modutils-contversion;.</para>
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
<sect4><title>depmod</title>
<para>depmod handles dependency descriptions for loadable
diff --git a/appendixa/modutils-shortdesc.xml b/appendixa/modutils-shortdesc.xml
new file mode 100644
index 000000000..d77709da7
--- /dev/null
+++ b/appendixa/modutils-shortdesc.xml
@@ -0,0 +1,16 @@
+<sect2><title>Contents of Modutils</title>
+
+<para>Last checked against version &modutils-contversion;.</para>
+
+<para>The Modutils package contains programs that you can use to work with
+kernel modules.</para>
+
+<para>Modutils installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>depmod, genksyms, insmod, insmod_ksymoops_clean, kallsyms (link to
+insmod), kernelversion, ksyms (link to insmod), lsmod (link to insmod),
+modinfo, modprobe (link to insmod) and rmmod (link to insmod)</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/modutils.xml b/appendixa/modutils.xml
index e2d705d51..c7bb69082 100644
--- a/appendixa/modutils.xml
+++ b/appendixa/modutils.xml
@@ -3,6 +3,7 @@
<?dbhtml filename="modutils.html" dir="appendixa"?>
&aa-modutils-down;
+&aa-modutils-shortdesc;
&aa-modutils-desc;
&aa-modutils-dep;
diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml
index 8fae0d674..6ae770984 100644
--- a/chapter06/modutils-inst.xml
+++ b/chapter06/modutils-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Modutils</title>
-<para>Install Modutils by running the following commands:</para>
+<para>Prepare Modutils 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>And finish off installing the package:</para>
-<para><screen><userinput>./configure &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml
index a26782946..eb556ca76 100644
--- a/chapter06/modutils.xml
+++ b/chapter06/modutils.xml
@@ -5,8 +5,8 @@
<screen>Estimated build time: &modutils-time;
Estimated required disk space: &modutils-compsize;</screen>
-&c6-modutils-inst;
-&aa-modutils-desc;
+&aa-modutils-shortdesc;
&aa-modutils-dep;
+&c6-modutils-inst;
</sect1>
diff --git a/entities/modutils.ent b/entities/modutils.ent
index d43b462eb..28faf6240 100644
--- a/entities/modutils.ent
+++ b/entities/modutils.ent
@@ -4,6 +4,7 @@
<!ENTITY c6-modutils-inst SYSTEM "../chapter06/modutils-inst.xml">
<!ENTITY aa-modutils SYSTEM "../appendixa/modutils.xml">
+<!ENTITY aa-modutils-shortdesc SYSTEM "../appendixa/modutils-shortdesc.xml">
<!ENTITY aa-modutils-desc SYSTEM "../appendixa/modutils-desc.xml">
<!ENTITY aa-modutils-dep SYSTEM "../appendixa/modutils-dep.xml">
<!ENTITY aa-modutils-down SYSTEM "../appendixa/modutils-down.xml">