Index: general/graphlib/libtiff/libtiff-config.xml
===================================================================
--- general/graphlib/libtiff/libtiff-config.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
+++ general/graphlib/libtiff/libtiff-config.xml	(revision cf4aab78aa6bf7a8008a14fc33cab6dd5155a970)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring libtiff</title>
+<title>Configuring <application>libtiff</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/graphlib/libtiff/libtiff-desc.xml
===================================================================
--- general/graphlib/libtiff/libtiff-desc.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
+++ general/graphlib/libtiff/libtiff-desc.xml	(revision cf4aab78aa6bf7a8008a14fc33cab6dd5155a970)
@@ -2,14 +2,14 @@
 <title>Contents</title>
 
-<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 <filename>tiff</filename>
+<para>The libtiff package contains <command>fax2ps</command>,
+<command>fax2tiff</command>, <command>gif2tiff</command>,
+<command>pal2rgb</command>, <command>ppm2tiff</command>,
+<command>ras2tiff</command>, <command>rgb2ycbcr</command>,
+<command>thumbnail</command>, <command>tiff2bw</command>,
+<command>tiff2ps</command>, <command>tiff2rgba</command>,
+<command>tiffcmp</command>, <command>tiffcp</command>,
+<command>tiffdither</command>, <command>tiffdump</command>,
+<command>tiffinfo</command>, <command>tiffmedian</command>,
+<command>tiffsplit</command> and <filename>tiff</filename>
 libraries.</para>
 
@@ -19,37 +19,41 @@
 
 <sect3><title>fax2ps</title>
-<para>fac2ps converts a TIFF facsimile to compressed postscript 
+<para><command>fac2ps</command> converts a <acronym>TIFF</acronym> facsimile to compressed postscript 
 file.</para></sect3>
 
 <sect3><title>fax2tiff</title>
-<para>fax2tiff creates a TIFF Class F fax file from raw fax 
+<para><command>fax2tiff</command> creates a <acronym>TIFF</acronym> Class F fax file from raw fax 
 data.</para></sect3>
 
 <sect3><title>gif2tiff</title>
-<para>gif2tiff creates a TIFF file from a GIF87 format image 
+<para><command>gif2tiff</command> creates a <acronym>TIFF</acronym> file
+from a <acronym>GIF87</acronym> format image 
 file.</para></sect3>
 
 <sect3><title>pal2rgb</title>
-<para>pal2rgb converts a palette color TIFF image to a full 
+<para><command>pal2rgb</command> converts a palette color
+<acronym>TIFF</acronym> image to a full 
 color image.</para></sect3>
 
 <sect3><title>ppm2tiff</title>
-<para>ppm2tiff creates a TIFF file from a PPM image file.</para></sect3>
+<para><command>ppm2tiff</command> creates a <acronym>TIFF</acronym> file
+from a <acronym>PPM</acronym> image file.</para></sect3>
 
 <sect3><title>ras2tiff</title>
-<para>ras2tiff creates a TIFF file from a Sun rasterfile.</para></sect3>
+<para><command>ras2tiff</command> creates a <acronym>TIFF</acronym> file from a Sun rasterfile.</para></sect3>
 
 <sect3><title>rgb2ycbcr</title>
-<para>rgb2ycbcr converts non-YCbCr TIFF images to a YCbCr TIFF 
+<para><command>rgb2ycbcr</command> converts non-YCbCr
+<acronym>TIFF</acronym> images to a YCbCr <acronym>TIFF</acronym> 
 image.</para></sect3>
 
 <sect3><title>thumbnail</title>
-<para>thumbnail creates a TIFF file with thumbnail images.</para></sect3>
+<para><command>thumbnail</command> creates a <acronym>TIFF</acronym> file with thumbnail images.</para></sect3>
 
 <sect3><title>tiff2bw</title>
-<para>tiff2bw converts a color TIFF image to grayscale.</para></sect3>
+<para><command>tiff2bw</command> converts a color <acronym>TIFF</acronym> image to grayscale.</para></sect3>
 
 <sect3><title>tiff2ps</title>
-<para>tiff2ps converts a TIFF image to a postscript file.</para></sect3>
+<para><command>tiff2ps</command> converts a <acronym>TIFF</acronym> image to a postscript file.</para></sect3>
 
 <sect3><title>tiff2rgba</title>
@@ -57,26 +61,30 @@
 
 <sect3><title>tiffcmp</title>
-<para>tiffcmp compares two TIFF files.</para></sect3>
+<para><command>tiffcmp</command> compares two <acronym>TIFF</acronym> files.</para></sect3>
 
 <sect3><title>tiffcp</title>
-<para>tiffcp copies (and possibly converts) a TIFF file.</para></sect3>
+<para><command>tiffcp</command> copies (and possibly converts) a
+<acronym>TIFF</acronym> file.</para></sect3>
 
 <sect3><title>tiffdither</title>
-<para>tiffdither converts a grayscale image to bilevel using 
+<para><command>tiffdither</command> converts a grayscale image to bilevel using 
 dithering.</para></sect3>
 
 <sect3><title>tiffdump</title>
-<para>tiffdump prints verbatim information about TIFF files.</para></sect3>
+<para><command>tiffdump</command> prints verbatim information about
+<acronym>TIFF</acronym> files.</para></sect3>
 
 <sect3><title>tiffinfo</title>
-<para>tiffinfo prints information about TIFF files.</para></sect3>
+<para><command>tiffinfo</command> prints information about
+<acronym>TIFF</acronym> files.</para></sect3>
 
 <sect3><title>tiffmedian</title>
-<para>tiffmedian applies the median cut algorithm to data in a 
-TIFF file.</para></sect3>
+<para><command>tiffmedian</command> applies the median cut algorithm to data in a 
+<acronym>TIFF</acronym> file.</para></sect3>
 
 <sect3><title>tiffsplit</title>
-<para>tiffsplit splits a multi-image TIFF into single-image 
-TIFF files.</para></sect3>
+<para><command>tiffsplit</command> splits a multi-image
+<acronym>TIFF</acronym> into single-image 
+<acronym>TIFF</acronym> files.</para></sect3>
 
 <sect3><title>tiff libraries</title>
Index: general/graphlib/libtiff/libtiff-exp.xml
===================================================================
--- general/graphlib/libtiff/libtiff-exp.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
+++ general/graphlib/libtiff/libtiff-exp.xml	(revision cf4aab78aa6bf7a8008a14fc33cab6dd5155a970)
@@ -2,12 +2,12 @@
 <title>Command explanations</title>
 
-<para><userinput>--noninteractive</userinput> : This switch is used to
+<para><command>--noninteractive</command> : 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-DIR_MAN=/usr/share/man</userinput> : This is
+<para><command>--with-DIR_MAN=/usr/share/man</command> : This is
 used because despite the fact we pass
-<userinput>--prefix=/usr</userinput>, the configure
+<command>--prefix=/usr</command>, the configure
 routine tries to install the man pages in
 <filename>/usr/local/man</filename> instead of the
Index: general/graphlib/libtiff/libtiff-inst.xml
===================================================================
--- general/graphlib/libtiff/libtiff-inst.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
+++ general/graphlib/libtiff/libtiff-inst.xml	(revision cf4aab78aa6bf7a8008a14fc33cab6dd5155a970)
@@ -1,11 +1,11 @@
 <sect2>
-<title>Installation of libtiff</title>
+<title>Installation of <application>libtiff</application></title>
 
-<para>Install libtiff by running the following commands:</para>
+<para>Install <application>libtiff</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --noninteractive \
+<para><screen><userinput><command>./configure --prefix=/usr --noninteractive \
    --with-DIR_MAN=/usr/share/man &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: general/graphlib/libtiff/libtiff-intro.xml
===================================================================
--- general/graphlib/libtiff/libtiff-intro.xml	(revision ccdc9c5383784246741c24e6ba57612642154fe6)
+++ general/graphlib/libtiff/libtiff-intro.xml	(revision cf4aab78aa6bf7a8008a14fc33cab6dd5155a970)
@@ -1,16 +1,19 @@
 <sect2>
-<title>Introduction to libtiff</title>
+<title>Introduction to <application>libtiff</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libtiff-download-http;"/>
-Download location (FTP):        <ulink url="&libtiff-download-ftp;"/>
-Version used:                   &libtiff-version;
-Package size:                   &libtiff-size;
-Estimated Disk space required:  &libtiff-buildsize;
-Estimated build time:           &libtiff-time;</screen>
-
-<para>The libtiff package contains the tiff libraries and associated
+<para>The <application>libtiff</application> package contains the tiff libraries and associated
 utilities.  The libraries are used by many programs for reading and
 writing tiff files and the utilities are useful for general work with
 tiff files.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&libtiff-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&libtiff-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libtiff-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &libtiff-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &libtiff-time;</para></listitem></itemizedlist>
+</sect3>
+
+
 </sect2>
