Convert zlib to new layout. Conform shortdesc files.

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

13 files changed, 39 insertions, 6 deletions

diff --git a/appendixa/makedev-shortdesc.xml b/appendixa/makedev-shortdesc.xml
index bf5b98428..de672d4b0 100644
--- a/appendixa/makedev-shortdesc.xml
+++ b/appendixa/makedev-shortdesc.xml
@@ -8,6 +8,8 @@ directory. Detailed information about device nodes may be found
 in the <filename>Documentation/devices.txt</filename> file under
 the Linux kernel source tree.</para>
 
+<para>MAKDEV installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>MAKEDEV</para></sect3>
 
diff --git a/appendixa/manpages-shortdesc.xml b/appendixa/manpages-shortdesc.xml
index b89359674..3b3134b87 100644
--- a/appendixa/manpages-shortdesc.xml
+++ b/appendixa/manpages-shortdesc.xml
@@ -7,6 +7,8 @@ documentation details the C and C++ functions, describes a few
 important device files and provides documents which would otherwise
 be missing from other packages.</para>
 
+<para>Man-pages installs the following:</para>
+
 <sect3><title>Support Files</title>
 <para>Various manual pages.</para></sect3>
 
diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml
index 00f9d9610..6d4f597ef 100644
--- a/appendixa/patch-shortdesc.xml
+++ b/appendixa/patch-shortdesc.xml
@@ -6,7 +6,7 @@
 file usually is a list, created by the diff program, that contains
 instructions on how an original file needs to be modified.</para>
 
-<para>Make installs the following:</para>
+<para>Patch installs the following:</para>
 
 <sect3><title>Program Files</title>
 <para>patch</para></sect3>
diff --git a/appendixa/perl-shortdesc.xml b/appendixa/perl-shortdesc.xml
index d09afcea1..041b1c3d4 100644
--- a/appendixa/perl-shortdesc.xml
+++ b/appendixa/perl-shortdesc.xml
@@ -6,6 +6,8 @@
 and Report Language. Perl combines some of the best features of C,
 sed, awk and sh into one powerful language.</para>
 
+<para>Perl installs the following:</para>
+
 <sect3><title>Program files and libraries</title>
 
 <para>a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, perl, perl5.6.1,
diff --git a/appendixa/tar-shortdesc.xml b/appendixa/tar-shortdesc.xml
index 70489e8e3..1c0b4a771 100644
--- a/appendixa/tar-shortdesc.xml
+++ b/appendixa/tar-shortdesc.xml
@@ -5,6 +5,8 @@
 <para>Tar is an archiving program designed to store and extract
 files from an archive file known as a tar file.</para>
 
+<para>Tar installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>rmt and tar</para></sect3>
 
diff --git a/appendixa/texinfo-shortdesc.xml b/appendixa/texinfo-shortdesc.xml
index 562bd807f..ae095558f 100644
--- a/appendixa/texinfo-shortdesc.xml
+++ b/appendixa/texinfo-shortdesc.xml
@@ -6,6 +6,8 @@
 writing and converting Info documents, which provide system
 documentation.</para>
 
+<para>Texinfo installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>info, infokey, install-info, makeinfo, texi2dvi and
 texindex</para></sect3>
diff --git a/appendixa/textutils-shortdesc.xml b/appendixa/textutils-shortdesc.xml
index beac1bf2c..b7619f511 100644
--- a/appendixa/textutils-shortdesc.xml
+++ b/appendixa/textutils-shortdesc.xml
@@ -5,6 +5,8 @@
 <para>The Textutils package contains several file manipulation
 and text processing programs.</para>
 
+<para>Textutils installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>cat, cksum, comm, csplit, cut, expand,
 fmt, fold, head, join, md5sum, nl, od, paste, pr, ptx, sort, split, sum,
diff --git a/appendixa/utillinux-shortdesc.xml b/appendixa/utillinux-shortdesc.xml
index dae3704d3..956a035d8 100644
--- a/appendixa/utillinux-shortdesc.xml
+++ b/appendixa/utillinux-shortdesc.xml
@@ -7,6 +7,8 @@ utility programs. Some of the more prominent utilities are used
 to mount, unmount, format, partition and manage disk drives,
 open tty ports and fetch kernel messages.</para>
 
+<para>Util-linux installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
 colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,
diff --git a/appendixa/zlib-dep.xml b/appendixa/zlib-dep.xml
index 716d6c7bb..c39842fa9 100644
--- a/appendixa/zlib-dep.xml
+++ b/appendixa/zlib-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Zlib Installation Dependencies</title>
 
diff --git a/appendixa/zlib-desc.xml b/appendixa/zlib-desc.xml
index 45f1823a1..184f4627a 100644
--- a/appendixa/zlib-desc.xml
+++ b/appendixa/zlib-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Zlib</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &zlib-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Library Files</title>
-<para>libz[a,so]</para></sect3>
+<para>Last checked against version &zlib-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>libz</title>
 <para>This is the zlib library, which is used by many programs for its
diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml
index 21d2b442f..09d34097e 100644
--- a/appendixa/zlib-down.xml
+++ b/appendixa/zlib-down.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Official Download Location</title>
 
diff --git a/appendixa/zlib-shortdesc.xml b/appendixa/zlib-shortdesc.xml
new file mode 100644
index 000000000..b02a68831
--- /dev/null
+++ b/appendixa/zlib-shortdesc.xml
@@ -0,0 +1,15 @@
+<sect2><title>Contents of Zlib</title>
+
+<para>Last checked against version &zlib-contversion;.</para>
+
+<para>The Zlib package contains the zlib library, which
+is used by many programs for its compression and uncompression
+functions.</para>
+
+<para>Zlib installs the following:</para>
+
+<sect3><title>Library Files</title>
+<para>libz[a,so]</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/zlib.xml b/appendixa/zlib.xml
index b1f41a223..5e2b58746 100644
--- a/appendixa/zlib.xml
+++ b/appendixa/zlib.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="zlib.html" dir="appendixa"?>
 
 &aa-zlib-down;
+&aa-zlib-shortdesc;
 &aa-zlib-desc;
 &aa-zlib-dep;