Index: book/library-config.xml
===================================================================
--- book/library-config.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ book/library-config.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -4,4 +4,4 @@
 <filename>/etc/ld.so.conf</filename> so that ldd can find the shared
 libraries.  After checking that this is the case,
-<userinput>/sbin/ldconfig</userinput> should be run whilst logged in as
+<userinput>/sbin/ldconfig</userinput> should be run while logged in as
 root.</para>
Index: general/graphlib/aalib/aalib-intro.xml
===================================================================
--- general/graphlib/aalib/aalib-intro.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/aalib/aalib-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -6,5 +6,6 @@
 Version used:                   &aalib-version;
 Package size:                   &aalib-size;
-Estimated Disk space required:  &aalib-buildsize;</screen>
+Estimated Disk space required:  &aalib-buildsize;
+Estimated build time:           &aalib-time;</screen>
 
 <para>aalib is a library to render any graphic into ascii art.</para>
Index: general/graphlib/imlib/imlib-exp.xml
===================================================================
--- general/graphlib/imlib/imlib-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/imlib/imlib-exp.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
  
-<para><userinput>CPPFLAGS=-w :</userinput> This disables gcc-&gcc-version; warnings that confuse configure.</para>
+<para><userinput>CPPFLAGS=-w</userinput> : This disables gcc-&gcc-version; warnings that confuse configure.</para>
 
-<para><userinput>--sysconfdir=/etc/imlib :</userinput> This installs and
+<para><userinput>--sysconfdir=/etc/imlib</userinput> : This installs and
 combines the configurations files into <filename>/etc</filename> instead
 of <filename>/usr/etc</filename>.</para>
Index: general/graphlib/lcms/lcms-desc.xml
===================================================================
--- general/graphlib/lcms/lcms-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/lcms/lcms-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The lcms package contains the <userinput>lcms library</userinput></para>
+<para>The lcms package contains the <userinput>lcms library</userinput>.</para>
 
 </sect2>
Index: general/graphlib/libjpeg/libjpeg-desc.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libjpeg/libjpeg-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The libjpeg package contains <userinput>cjpeg, djpeg, jpegtran,
-rdjpgcom, wrjpgcom</userinput> and the <userinput>jpeg
+<para>The libjpeg package contains <userinput>cjpeg</userinput>,
+<userinput>djpeg</userinput>, <userinput>jpegtran</userinput>,
+<userinput>rdjpgcom</userinput>, <userinput>wrjpgcom</userinput> and <userinput>jpeg
 libraries</userinput>.</para>
 
@@ -13,5 +14,5 @@
 <para>cjpeg compresses image files to produce a JPEG/JFIF file on the standard
 output.  Currently supported input file formats are: PPM (PBMPLUS color
-format), PGM (PBMPLUS gray-scale format), BMP, and Targa</para></sect3>
+format), PGM (PBMPLUS gray-scale format), BMP, and Targa.</para></sect3>
 
 <sect3><title>djpeg</title>
@@ -22,12 +23,12 @@
 <sect3><title>jpegtran</title>
 <para>jpegtran is used for lossless transformation of JPEG
-files</para></sect3>
+files.</para></sect3>
 
 <sect3><title>rdjpgcom</title>
 <para>rdjpgcom displays text comments from within a JPEG
-file</para></sect3>
+file.</para></sect3>
 
 <sect3><title>wrjpgcom</title>
-<para>wrjpgcom inserts text comments into a JPEG file</para></sect3>
+<para>wrjpgcom inserts text comments into a JPEG file.</para></sect3>
 
 <sect3><title>jpeg libraries</title>
Index: general/graphlib/libjpeg/libjpeg-exp.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libjpeg/libjpeg-exp.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,6 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>./configure --enable-static --enable-shared --prefix=/usr</userinput> 
-This command tells libjpeg to build both shared and
+<para><userinput>./configure --enable-static --enable-shared --prefix=/usr</userinput> : This command tells libjpeg to build both shared and
 static libraries and to install them with a base of /usr.</para>
 
Index: general/graphlib/libjpeg/libjpeg-intro.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-intro.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libjpeg/libjpeg-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -6,5 +6,6 @@
 Version used:                   &libjpeg-version;
 Package size:                   &libjpeg-size;
-Estimated Disk space required:  &libjpeg-buildsize;</screen>
+Estimated Disk space required:  &libjpeg-buildsize;
+Estimated build time:           &libjpeg-time;</screen>
 
 <para>The libjpeg package contains the jpeg libraries.  These allow compression
Index: general/graphlib/libmng/libmng-desc.xml
===================================================================
--- general/graphlib/libmng/libmng-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libmng/libmng-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libmng package contains the <userinput>mng
+<para>The libmng package contains <userinput>mng
 libraries</userinput>.</para>
 
Index: general/graphlib/libpng/libpng-desc.xml
===================================================================
--- general/graphlib/libpng/libpng-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libpng/libpng-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libpng package contains the <userinput>png
+<para>The libpng package contains <userinput>png
 libraries</userinput> and <userinput>libpng-config</userinput>.</para>
 
Index: general/graphlib/libpng/libpng-exp.xml
===================================================================
--- general/graphlib/libpng/libpng-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libpng/libpng-exp.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,14 +2,8 @@
 <title>Command explanations</title>
 
-<!--
-<para><userinput>CC="gcc $CFLAGS" :</userinput> This makes libpng use
-CFLAGS when compiling.</para>
--->
-
-<para><userinput>ZLIBINC=/usr/include ZLIBLIB=/usr/lib
-:</userinput> This forces libpng to look for the zlib includes and
+<para><userinput>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</userinput> : This forces libpng to look for the zlib includes and
 libraries where we have them installed.</para>
 
-<para><userinput>-f scripts/makefile.linux :</userinput> This points
+<para><userinput>-f scripts/makefile.linux</userinput> : This points
 make at the the Linux version of the makefile as libpng doesn't use a
 autoconf routine instead coming with various makefiles for different
Index: general/graphlib/libtiff/libtiff-desc.xml
===================================================================
--- general/graphlib/libtiff/libtiff-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libtiff/libtiff-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,8 +2,14 @@
 <title>Contents</title>
 
-<para>The libtiff package contains <userinput>fax2ps, fax2tiff, gif2tiff, 
-pal2rgb, ppm2tiff, ras2tiff, rgb2ycbcr, thumbnail, tiff2bw, tiff2ps,
-tiff2rgba, tiffcmp, tiffcp, tiffdither, tiffdump, tiffinfo, tiffmedian,
-tiffsplit</userinput> and the <userinput>tiff libraries</userinput></para>
+<para>The libtiff package contains <userinput>fax2ps</userinput>,
+<userinput>fax2tiff</userinput>, <userinput>gif2tiff</userinput>,
+<userinput>pal2rgb</userinput>, <userinput>ppm2tiff</userinput>,
+<userinput>ras2tiff</userinput>, <userinput>rgb2ycbcr</userinput>,
+<userinput>thumbnail</userinput>, <userinput>tiff2bw</userinput>,
+<userinput>tiff2ps</userinput>, <userinput>tiff2rgba</userinput>,
+<userinput>tiffcmp</userinput>, <userinput>tiffcp</userinput>,
+<userinput>tiffdither</userinput>, <userinput>tiffdump</userinput>,
+<userinput>tiffinfo</userinput>, <userinput>tiffmedian</userinput>,
+<userinput>tiffsplit</userinput> and <userinput>tiff libraries</userinput></para>
 
 </sect2>
@@ -13,67 +19,67 @@
 <sect3><title>fax2ps</title>
 <para>fac2ps converts a TIFF facsimile to compressed postscript 
-file</para></sect3>
+file.</para></sect3>
 
 <sect3><title>fax2tiff</title>
 <para>fax2tiff creates a TIFF Class F fax file from raw fax 
-data</para></sect3>
+data.</para></sect3>
 
 <sect3><title>gif2tiff</title>
 <para>gif2tiff creates a TIFF file from a GIF87 format image 
-file</para></sect3>
+file.</para></sect3>
 
 <sect3><title>pal2rgb</title>
 <para>pal2rgb converts a palette color TIFF image to a full 
-color image</para></sect3>
+color image.</para></sect3>
 
 <sect3><title>ppm2tiff</title>
-<para>ppm2tiff creates a TIFF file from a PPM image file</para></sect3>
+<para>ppm2tiff creates a TIFF file from a PPM image file.</para></sect3>
 
 <sect3><title>ras2tiff</title>
-<para>ras2tiff creates a TIFF file from a Sun rasterfile</para></sect3>
+<para>ras2tiff creates a TIFF file from a Sun rasterfile.</para></sect3>
 
 <sect3><title>rgb2ycbcr</title>
 <para>rgb2ycbcr converts non-YCbCr TIFF images to a YCbCr TIFF 
-image</para></sect3>
+image.</para></sect3>
 
 <sect3><title>thumbnail</title>
-<para>thumbnail creates a TIFF file with thumbnail images</para></sect3>
+<para>thumbnail creates a TIFF file with thumbnail images.</para></sect3>
 
 <sect3><title>tiff2bw</title>
-<para>tiff2bw converts a color TIFF image to greyscale</para></sect3>
+<para>tiff2bw converts a color TIFF image to greyscale.</para></sect3>
 
 <sect3><title>tiff2ps</title>
-<para>tiff2ps converts a TIFF image to a postscript file</para></sect3>
+<para>tiff2ps converts a TIFF image to a postscript file.</para></sect3>
 
 <sect3><title>tiff2rgba</title>
-<para>No description available</para></sect3>
+<para>No description available.</para></sect3>
 
 <sect3><title>tiffcmp</title>
-<para>tiffcmp compares two TIFF files</para></sect3>
+<para>tiffcmp compares two TIFF files.</para></sect3>
 
 <sect3><title>tiffcp</title>
-<para>tiffcp copies (and possibly converts) a TIFF file</para></sect3>
+<para>tiffcp copies (and possibly converts) a TIFF file.</para></sect3>
 
 <sect3><title>tiffdither</title>
 <para>tiffdither converts a greyscale image to bilevel using 
-dithering</para></sect3>
+dithering.</para></sect3>
 
 <sect3><title>tiffdump</title>
-<para>tiffdump prints verbatim information about TIFF files</para></sect3>
+<para>tiffdump prints verbatim information about TIFF files.</para></sect3>
 
 <sect3><title>tiffinfo</title>
-<para>tiffinfo prints information about TIFF files</para></sect3>
+<para>tiffinfo prints information about TIFF files.</para></sect3>
 
 <sect3><title>tiffmedian</title>
 <para>tiffmedian applies the median cut algorithm to data in a 
-TIFF file</para></sect3>
+TIFF file.</para></sect3>
 
 <sect3><title>tiffsplit</title>
 <para>tiffsplit splits a multi-image TIFF into single-image 
-TIFF files</para></sect3>
+TIFF files.</para></sect3>
 
 <sect3><title>tiff libraries</title>
 <para>The tiff libraries are used by many programs to read and write
-tiff files</para></sect3>
+tiff files.</para></sect3>
 
 </sect2>
Index: general/graphlib/libtiff/libtiff-exp.xml
===================================================================
--- general/graphlib/libtiff/libtiff-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libtiff/libtiff-exp.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,14 +2,10 @@
 <title>Command explanations</title>
 
-<para><userinput>--noninteractive :</userinput> This switch is used to
+<para><userinput>--noninteractive</userinput> : This switch is used to
 avoid the configuration routine asking for confirmation of the
 directories to install to (which we pass using switches to configure
 anyways).</para> 
 
-<para><userinput>--with-GCOPTS="$CFLAGS" :</userinput> This switch
-causes libtiff to be built using the options we have set in $CFLAGS
-(which most other packages handle automatically).</para>
-
-<para><userinput>--with-DIR_MAN=/usr/share/man :</userinput> This is
+<para><userinput>--with-DIR_MAN=/usr/share/man</userinput> : This is
 used because despite the fact we pass --prefix=/usr, the configure
 routine tries to install the man pages in /usr/local/man instead of the
Index: general/graphlib/libtiff/libtiff-inst.xml
===================================================================
--- general/graphlib/libtiff/libtiff-inst.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libtiff/libtiff-inst.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -5,5 +5,5 @@
 
 <para><screen><userinput>./configure --prefix=/usr --noninteractive \
-   --with-GCOPTS="$CFLAGS" --with-DIR_MAN=/usr/share/man &amp;&amp;
+   --with-DIR_MAN=/usr/share/man &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: general/graphlib/libtiff/libtiff-intro.xml
===================================================================
--- general/graphlib/libtiff/libtiff-intro.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libtiff/libtiff-intro.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -6,5 +6,6 @@
 Version used:                   &libtiff-version;
 Package size:                   &libtiff-size;
-Estimated Disk space required:  &libtiff-buildsize;</screen>
+Estimated Disk space required:  &libtiff-buildsize;
+Estimated build time:           &libtiff-time;</screen>
 
 <para>The libtiff package contains the tiff libraries and associated
Index: general/graphlib/libungif/libungif-desc.xml
===================================================================
--- general/graphlib/libungif/libungif-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ general/graphlib/libungif/libungif-desc.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -2,9 +2,19 @@
 <title>Contents</title>
 
-<para>The libungif package contains <userinput>gif2epsn, gif2ps, gif2rgb, 
-gifasm, gifbg, gifburst, gifclip, gifclrmp, gifcolor, gifcomb, gifcompose, 
-giffiltr, giffix, gifflip, gifhisto, gifinfo, gifinter, gifinto, gifovly, 
-gifpos, gifrotat, gifrsize, gifspnge, giftext, gifwedge, icon2gif, raw2gif, 
-rgb2gif, text2gif</userinput> and the <userinput>ungif
+<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 <userinput>ungif
 libraries</userinput>.</para>
 
@@ -84,5 +94,5 @@
 
 <sect3><title>giftext</title>
-<para>Print (text only) general information about a GIF</para></sect3>
+<para>Print (text only) general information about a GIF.</para></sect3>
 
 <sect3><title>gifwedge</title>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
+++ introduction/welcome/credits.xml	(revision b6194c546bcba7b74427ab1fcaf3d74120a75c42)
@@ -121,8 +121,11 @@
 Campbell</emphasis></para></listitem>
 
+<listitem><para>tripwire : <emphasis>Manfred
+Glombowski</emphasis></para></listitem>
+
 <listitem><para>alsa-oss, inetutils, gdk, GLib, GTK+, libxml and vim: <emphasis>James
 Iwanek</emphasis></para></listitem>
 
-<listitem><para><!--<xref linkend="iptables"/>-->iptables: <emphasis>Henning
+<listitem><para>iptables: <emphasis>Henning
 Rohde</emphasis></para></listitem>
 
