Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/genlib/genlib.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -7,29 +7,27 @@
 duplicate code (and risk introducing bugs), it just has to call
 functions from the libraries installed on the system.  The most obvious
-example of a set of libraries is glibc which is installed during the LFS
-book.  This contains all of the C library functions which programs
-use.</para>
+example of a set of libraries is <application>glibc</application> which is 
+installed during the <acronym>LFS</acronym> book.  This contains all of
+the <application>C</application> library functions which programs use.</para>
 
-<para>There are two types of library, static and shared.  Shared
-libraries (usually <filename>libXXX.so</filename>) are loaded into memory from the shared
-copy at runtime (hence the name).  Static libraries
-(<filename>libXXX.a</filename>) are
-actually linked into the program executable file itself, thus making the
-program file larger.  Quite often, you will find both static and shared
-copies of the same library on your system.</para>
+<para>There are two types of library, static and shared.  Shared libraries 
+(usually <filename>libXXX.so</filename>) are loaded into memory from the shared
+copy at runtime (hence the name).  Static libraries (<filename>libXXX.a
+</filename>) are actually linked into the program executable file itself, thus 
+making the program file larger.  Quite often, you will find both static and 
+shared copies of the same library on your system.</para>
 
 <para>Generally, you only need to install libraries when you are
 installing software which requires functionality which they supply.  In
-the BLFS book, each package is listed with a list of (known)
+the <acronym>BLFS</acronym> book, each package is listed with a list of (known)
 dependencies.  Thus, you can figure out which libraries you need to have
 before installing that program.  If you are installing something without
-using BLFS instructions, usually the <filename>README</filename>  or
-<filename>INSTALL</filename> file will contain details of the programs
-requirements.</para>
+using <acronym>BLFS</acronym> instructions, usually the <filename>README
+</filename>  or <filename>INSTALL</filename> file will contain details of the 
+programs requirements.</para>
 
-<para>There are certain libraries which nearly
-<emphasis>everyone</emphasis> will need at some point.  In this chapter
-we list these and some others and explain why you may want to install
-them.</para>
+<para>There are certain libraries which nearly <emphasis>everyone</emphasis> 
+will need at some point.  In this chapter we list these and some others and 
+explain why you may want to install them.</para>
 
 &openssl;
Index: general/graphlib/libpng/libpng-intro.xml
===================================================================
--- general/graphlib/libpng/libpng-intro.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libpng/libpng-intro.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -3,5 +3,5 @@
 
 <para>The <application>libpng</application> package contains libraries used
-by other programs for reading and writing png files.</para>
+by other programs for reading and writing <acronym>PNG</acronym> files.</para>
 
 <sect3><title>Package information</title>
Index: general/graphlib/libpng/libpng.ent
===================================================================
--- general/graphlib/libpng/libpng.ent	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libpng/libpng.ent	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -7,6 +7,6 @@
 <!ENTITY libpng-buildsize "4.1 MB">
 <!ENTITY libpng-version "1.2.5">
-<!ENTITY libpng-download-http "http://www.libpng.org/pub/png/src/libpng-1.2.5.tar.bz2">
+<!ENTITY libpng-download-http "http://telia.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.5.tar.bz2">
 <!ENTITY libpng-download-ftp "ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.5.tar.gz">
 <!ENTITY libpng-size "376 KB">
-<!ENTITY libpng-time "">
+<!ENTITY libpng-time "0.16">
Index: general/graphlib/libungif/libungif-config.xml
===================================================================
--- general/graphlib/libungif/libungif-config.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libungif/libungif-config.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring libungif</title>
+<title>Configuring <application>libungif</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/graphlib/libungif/libungif-desc.xml
===================================================================
--- general/graphlib/libungif/libungif-desc.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libungif/libungif-desc.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -2,19 +2,19 @@
 <title>Contents</title>
 
-<para>The libungif package contains <userinput>gif2epsn</userinput>,
-<userinput>gif2ps</userinput>, <userinput>gif2rgb</userinput>,
-<userinput>gifasm</userinput>, <userinput>gifbg</userinput>,
-<userinput>gifburst</userinput>, <userinput>gifclip</userinput>,
-<userinput>gifclrmp</userinput>, <userinput>gifcolor</userinput>,
-<userinput>gifcomb</userinput>, <userinput>gifcompose</userinput>,
-<userinput>giffiltr</userinput>, <userinput>giffix</userinput>,
-<userinput>gifflip</userinput>, <userinput>gifhisto</userinput>,
-<userinput>gifinfo</userinput>, <userinput>gifinter</userinput>,
-<userinput>gifinto</userinput>, <userinput>gifovly</userinput>,
-<userinput>gifpos</userinput>, <userinput>gifrotat</userinput>,
-<userinput>gifrsize</userinput>, <userinput>gifspnge</userinput>,
-<userinput>giftext</userinput>, <userinput>gifwedge</userinput>,
-<userinput>icon2gif</userinput>, <userinput>raw2gif</userinput>,
-<userinput>rgb2gif</userinput>, <userinput>text2gif</userinput> and
+<para>The libungif package contains <command>gif2epsn</command>,
+<command>gif2ps</command>, <command>gif2rgb</command>,
+<command>gifasm</command>, <command>gifbg</command>,
+<command>gifburst</command>, <command>gifclip</command>,
+<command>gifclrmp</command>, <command>gifcolor</command>,
+<command>gifcomb</command>, <command>gifcompose</command>,
+<command>giffiltr</command>, <command>giffix</command>,
+<command>gifflip</command>, <command>gifhisto</command>,
+<command>gifinfo</command>, <command>gifinter</command>,
+<command>gifinto</command>, <command>gifovly</command>,
+<command>gifpos</command>, <command>gifrotat</command>,
+<command>gifrsize</command>, <command>gifspnge</command>,
+<command>giftext</command>, <command>gifwedge</command>,
+<command>icon2gif</command>, <command>raw2gif</command>,
+<command>rgb2gif</command>, <command>text2gif</command> and
 <filename>libungif</filename> libraries.</para>
 
@@ -24,27 +24,30 @@
 
 <sect3><title>gif2epsn</title>
-<para>Dumps images saved as GIF files on Epson type printers.</para></sect3>
+<para>Dumps images saved as <acronym>GIF</acronym> files on Epson type printers.</para></sect3>
 
 <sect3><title>gif2ps</title>
-<para>Print GIF file on laser printers supporting PostScript.</para></sect3>
+<para>Print <acronym>GIF</acronym> file on laser printers supporting PostScript.
+</para></sect3>
 
 <sect3><title>gif2rgb</title>
-<para>Convert images saved as GIF to 24-bit RGB image(s).</para></sect3>
+<para>Convert images saved as <acronym>GIF</acronym> to 24-bit <acronym>RGB
+</acronym> image(s).</para></sect3>
 
 <sect3><title>gifasm</title>
-<para>assemble multiple GIFs into one, or burst a 
-multiple-image GIF.</para></sect3>
+<para>assemble multiple <acronym>GIF</acronym>s into one, or burst a 
+multiple-image <acronym>GIF</acronym>.</para></sect3>
 
 <sect3><title>gifbg</title>
-<para>Generate a single-color test pattern GIF.</para></sect3>
+<para>Generate a single-color test pattern <acronym>GIF</acronym>.</para>
+</sect3>
 
 <sect3><title>gifburst</title>
-<para>Burst a GIF image into subrectangles.</para></sect3>
+<para>Burst a <acronym>GIF</acronym> image into subrectangles.</para></sect3>
 
 <sect3><title>gifclip</title>
-<para>Clip or crop a GIF image.</para></sect3>
+<para>Clip or crop a <acronym>GIF</acronym> image.</para></sect3>
 
 <sect3><title>gifclrmp</title>
-<para>Modify GIF image colormaps.</para></sect3>
+<para>Modify <acronym>GIF</acronym> image colormaps.</para></sect3>
 
 <sect3><title>gifcolor</title>
@@ -52,5 +55,6 @@
 
 <sect3><title>gifcomb</title>
-<para>Combine 2 GIF images of exactly the same size into one.</para></sect3>
+<para>Combine 2 <acronym>GIF</acronym> images of exactly the same size into one.
+</para></sect3>
 
 <sect3><title>gifcompose</title>
@@ -58,17 +62,21 @@
 
 <sect3><title>giffiltr</title>
-<para>Template code for filtering a GIF sequentially.</para></sect3>
+<para>Template code for filtering a <acronym>GIF</acronym> sequentially.</para>
+</sect3>
 
 <sect3><title>giffix</title>
-<para>Clumsily attempts to fix truncated GIF images.</para></sect3>
+<para>Clumsily attempts to fix truncated <acronym>GIF</acronym> images.</para>
+</sect3>
 
 <sect3><title>gifflip</title>
-<para>Flip GIF image along X or Y axis or rotate by 90 degrees.</para></sect3>
+<para>Flip <acronym>GIF</acronym> image along X or Y axis or rotate by 90 
+degrees.</para></sect3>
 
 <sect3><title>gifhisto</title>
-<para>Generate color-frequency histogram from a GIF.</para></sect3>
+<para>Generate color-frequency histogram from a <acronym>GIF</acronym>.</para>
+</sect3>
 
 <sect3><title>gifinfo</title>
-<para>Gives information on a GIF file.</para></sect3>
+<para>Gives information on a <acronym>GIF</acronym> file.</para></sect3>
 
 <sect3><title>gifinter</title>
@@ -76,8 +84,9 @@
 
 <sect3><title>gifinto</title>
-<para>End-of-pipe fitting for GIF-processing pipelines.</para></sect3>
+<para>End-of-pipe fitting for <acronym>GIF</acronym>-processing pipelines.</para></sect3>
 
 <sect3><title>gifovly</title>
-<para>Generate one composite GIF from a multiple-image GIF.</para></sect3>
+<para>Generate one composite <acronym>GIF</acronym> from a multiple-image 
+<acronym>GIF</acronym>.</para></sect3>
 
 <sect3><title>gifpos</title>
@@ -85,18 +94,21 @@
 
 <sect3><title>gifrotat</title>
-<para>Rotate a GIF through any desired angle.</para></sect3>
+<para>Rotate a <acronym>GIF</acronym> through any desired angle.</para></sect3>
 
 <sect3><title>gifrsize</title>
-<para>Resize a GIF by deletion or duplication of bits.</para></sect3>
+<para>Resize a <acronym>GIF</acronym> by deletion or duplication of bits.</para>
+</sect3>
 
 <sect3><title>gifspnge</title>
-<para>Template code for filtering a GIF with in-core operations.</para></sect3>
+<para>Template code for filtering a <acronym>GIF</acronym> with in-core 
+operations.</para></sect3>
 
 <sect3><title>giftext</title>
-<para>Print (text only) general information about a GIF.</para></sect3>
+<para>Print (text only) general information about a <acronym>GIF</acronym>.
+</para></sect3>
 
 <sect3><title>gifwedge</title>
-<para>Create a test GIF image resembling a color monitor test
-pattern.</para></sect3>
+<para>Create a test <acronym>GIF</acronym> image resembling a color monitor 
+test pattern.</para></sect3>
 
 <sect3><title>icon2gif</title>
@@ -104,12 +116,14 @@
 
 <sect3><title>raw2gif</title>
-<para>Convert raw 8-bit image data into GIF files.</para></sect3>
+<para>Convert raw 8-bit image data into <acronym>GIF</acronym> files.</para>
+</sect3>
 
 <sect3><title>rgb2gif</title>
-<para>Convert 24 bit images to a GIF image using color 
+<para>Convert 24 bit images to a <acronym>GIF</acronym> image using color 
 quantization.</para></sect3>
 
 <sect3><title>text2gif</title>
-<para>Generate GIF images out of regular text in 8x8 font.</para></sect3>
+<para>Generate <acronym>GIF</acronym> images out of regular text in 8x8 font.
+</para></sect3>
 
 </sect2>
Index: general/graphlib/libungif/libungif-inst.xml
===================================================================
--- general/graphlib/libungif/libungif-inst.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libungif/libungif-inst.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of libungif</title>
+<title>Installation of <application>libungif</application></title>
 
-<para>Install libungif by running the following commands:</para>
+<para>Install <application>libungif</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</userinput></screen>
 
 <note><para>If you get an error during the make portion compiling
Index: general/graphlib/libungif/libungif-intro.xml
===================================================================
--- general/graphlib/libungif/libungif-intro.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libungif/libungif-intro.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -1,27 +1,31 @@
 <sect2>
-<title>Introduction to libungif</title>
+<title>Introduction to <application>libungif</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libungif-download-http;"/>
-Download location (FTP):        <ulink url="&libungif-download-ftp;"/>
-Version used:                   &libungif-version;
-Package size:                   &libungif-size;
-Estimated Disk space required:  &libungif-buildsize;
-Estimated build time:           &libungif-time;</screen>
+<para>The libungif package contains libraries for reading all
+<acronym>GIF</acronym>s and writing uncompressed ones as well as programs for 
+converting and working with <acronym>GIF</acronym> files.  The libraries are 
+useful for any graphics program wishing to deal with <acronym>GIF</acronym> 
+files while the programs are useful for conversion purposes as well as cleaning 
+up images.</para>
 
-<para>The libungif package contains libraries for reading all gifs and
-writing uncompressed ones as well as programs for converting and working
-with gif files.  The libraries are useful for any graphics program
-wishing to deal with gif files while the programs are useful for
-conversion purposes as well as cleaning up images.</para>
+<para>The reason libungif only writes uncompressed <acronym>GIF</acronym>s 
+is due to a legal issue with <acronym>LZW</acronym> compression (which Unisys 
+claims a patent on). Reading <acronym>GIF</acronym>s is not a problem as the 
+uncompression routines do not seem to be limited in this way.  Note that this 
+has in the past been disputed.  The best way to avoid this whole mess is to 
+simply use libungif for looking at <acronym>GIF</acronym> images on the web, 
+while in any pages which you design, use the open source <acronym>PNG</acronym> 
+format instead (which uses, not surprisingly, the libpng library) which has no 
+patent issues at all.</para>
 
-<para>The reason libungif only writes uncompressed gifs is due to a
-legal issue with LZW compression (which Unisys claims a patent on).
-Reading gifs is not a problem as the uncompression routines do not seem
-to be limited in this way.  Note that this has in the past been
-disputed.  The best way to avoid this whole mess is to simply use
-libungif for looking at gif images on the web, while in any pages which
-you design, use the open source png format instead (which uses, not
-surprisingly, the libpng library) which has no patent issues at
-all.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&libungif-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&libungif-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libungif-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &libungif-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &libungif-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: general/graphlib/libungif/libungif.ent
===================================================================
--- general/graphlib/libungif/libungif.ent	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ general/graphlib/libungif/libungif.ent	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -9,3 +9,3 @@
 <!ENTITY libungif-download-ftp "">
 <!ENTITY libungif-size "343 KB">
-<!ENTITY libungif-time "0.24 SBU">
+<!ENTITY libungif-time "0.11 SBU">
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision b3ae38717184c64d1f89a81c245d21332dfa57fe)
+++ postlfs/security/security.xml	(revision e1d7deca3a2da381d1e516206022c6acc4923ad3)
@@ -3,10 +3,25 @@
 <title>Security</title>
 
+<para>Security takes many forms in a computing environment. This chapter
+gives examples of three different types of security; access, prevention
+and detection.  Access for users is usually handled by
+<command>login</command> or an application designed to handle the login
+function.  In this chapter, we show how to enhance
+<command>login</command> by setting policies with
+<application><acronym>PAM</acronym></application> modules.  Access via networks
+can also be secured by policies set by
+<application>iptables</application>. Prevention of breaches, like
+trojans, are assisted by applications like <application>gnupg</application>, 
+specifically the ability to confirm signed packages, which prevents 
+modification of the tarball after the packager creates it. Finally, we touch on 
+detection with a package that stores "signatures" and then regenerates those
+"signatures" and compares for files that have been changed.</para>
+
 &shadow;
-&gnupg;
+&Linux_PAM;
 &iptables;
 &postlfs-security-fw;
+&gnupg;
 &tripwire;
-&Linux_PAM;
 &postlfs-security-syslog;
 
