Index: basicnet/netlibs/wvstreams/wvstreams-inst.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,9 +2,12 @@
 <title>Installation of wvstreams</title>
 
-<para>Download the wvstreams patch from <ulink url="&hfile-root;"/>.</para>
+<para>Download the wvstreams patches from <ulink url="&hfile-root;"/>.
+The wvcrypto patch is only necessary for
+<application>openssl-0.9.7</application> or greater.</para>
 
 <para>Install wvstreams by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../wvstreams-3.70-syntax.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../wvstreams-3.70-wvcrypto.patch &amp;&amp;
+patch -Np1 -i ../wvstreams-3.70-wvresolver.patch &amp;&amp;
 make PREFIX=/usr LDFLAGS="-lcrypt" &amp;&amp;
 make PREFIX=/usr install</userinput></screen></para>
Index: gnome/add/docs/gnome2-user-docs-desc.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/add/docs/gnome2-user-docs-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The gnome2-user-docs package contains <userinput>OMF files</userinput>.</para>
+<para>The gnome2-user-docs package contains <filename
+class="extension">OMF</filename> files.</para>
 
 </sect2>
Index: gnome/add/monitor/gnome-system-monitor-inst.xml
===================================================================
--- gnome/add/monitor/gnome-system-monitor-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/add/monitor/gnome-system-monitor-inst.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -9,7 +9,9 @@
 make install</userinput></screen></para>
 
-<note><para>make install will need path access to $GNOME_PREFIX/bin. If your
+<note><para>make install will need path access to <filename
+class="directory">$GNOME_PREFIX/bin</filename>. If your
 preinstallation changes were made only to the user account, you will
-need to adjust your path prior to running 'make install'.</para></note>
+need to adjust your path prior to running <userinput>make
+install</userinput>.</para></note>
 
 </sect2>
Index: gnome/lib/gnome-vfs/gnome-vfs-intro.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/gnome-vfs/gnome-vfs-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -9,5 +9,5 @@
 Estimated build time:           &gnome-vfs-time;</screen>
 
-<para>The gnome-vfs package contains virutal file system libraries. This is used
+<para>The gnome-vfs package contains virtual file system libraries. This is used
 as one of the foundations of the Nautilus file manager.</para>
 
Index: gnome/lib/gnomelib/libgnome-intro.xml
===================================================================
--- gnome/lib/gnomelib/libgnome-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/gnomelib/libgnome-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -12,5 +12,6 @@
 
 <screen>libgnome depends on:
-<xref linkend="esound"/>, <xref linkend="audiofile"/>, <xref linkend="ORBit2"/>, <xref linkend="GConf"/>, <xref linkend="bonobo-activation"/>, <xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></screen>
+<xref linkend="esound"/>, <xref linkend="audiofile"/>, <xref linkend="ORBit2"/>, <xref linkend="GConf"/>, 
+<xref linkend="bonobo-activation"/>, <xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></screen>
 
 </sect2>
Index: gnome/lib/gnomelib/libgnomeui-inst.xml
===================================================================
--- gnome/lib/gnomelib/libgnomeui-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/gnomelib/libgnomeui-inst.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -4,5 +4,6 @@
 <para>Install libgnomeui by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin --disable-gtk-doc &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
+--disable-gtk-doc &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: gnome/lib/gtk-doc/gtk-doc-intro.xml
===================================================================
--- gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -21,5 +21,6 @@
 
 <screen>gtk-doc depends on:
-<xref linkend="openjade"/>, <xref linkend="libxslt"/>, <xref linkend="DocBook"/>, <xref linkend="sgml-dtd-3"/> and <xref linkend="sgml-dtd"/></screen>
+<xref linkend="openjade"/>, <xref linkend="libxslt"/>, <xref linkend="DocBook"/>, 
+<xref linkend="sgml-dtd-3"/> and <xref linkend="sgml-dtd"/></screen>
 
 </sect2>
Index: gnome/lib/gtk-engines/gtk-engines-desc.xml
===================================================================
--- gnome/lib/gtk-engines/gtk-engines-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/gtk-engines/gtk-engines-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <sect3><title>engines libraries</title>
-<para>engine libraries is a theme manager.</para></sect3>
+<para>engines libraries are manager systems for specific themes.</para></sect3>
 
 <sect3><title>theme files</title>
Index: gnome/lib/intltool/intltool-intro.xml
===================================================================
--- gnome/lib/intltool/intltool-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/intltool/intltool-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -11,6 +11,9 @@
 is useful for extracting translatable strings from source files,
 collects the extracted strings with messages from traditional source
-files (<filename>&lt;source directory&gt;/&lt;package&gt;/po</filename>)
-and merging the translations into .xml, .desktop and .oaf files.</para>
+files (<filename class="directory">&lt;source directory&gt;/&lt;package&gt;/po</filename>)
+and merging the translations into <filename
+class="extension">.xml</filename>, <filename
+class="extension">.desktop</filename> and <filename
+class="extension">.oaf</filename> files.</para>
 
 
Index: gnome/lib/oaf/oaf-desc.xml
===================================================================
--- gnome/lib/oaf/oaf-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/oaf/oaf-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The oaf package contains <filename>oaf</filename> libraries.</para>
+<para>The oaf package contains <filename>liboaf</filename> libraries.</para>
 
 </sect2>
Index: gnome/lib/scrollkeeper/scrollkeeper-desc.xml
===================================================================
--- gnome/lib/scrollkeeper/scrollkeeper-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/scrollkeeper/scrollkeeper-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -3,5 +3,5 @@
 
 <para>The scrollkeeper package contains
-<filename>scrollkeeper</filename> libraries and utility scripts.</para>
+<filename>libscrollkeeper</filename> libraries and utility scripts.</para>
 
 </sect2>
Index: gnome/lib/vte/vte-desc.xml
===================================================================
--- gnome/lib/vte/vte-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/lib/vte/vte-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The vte package contains <filename>vte</filename> libraries,
+<para>The vte package contains <filename>libvte</filename> libraries,
 <userinput>vte</userinput> and <userinput>gnome-pty-helper</userinput></para>
 
Index: gnome/otherlibs/libglade14/libglade14-intro.xml
===================================================================
--- gnome/otherlibs/libglade14/libglade14-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ gnome/otherlibs/libglade14/libglade14-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -15,5 +15,5 @@
 libglade will utilize:
 <xref linkend="gnome-libs"/> and <xref linkend="Python"/> if compiled
-utilizing expat.</screen>
+utilizing <xref linkend="expat"/>.</screen>
 
 
Index: index.xml
===================================================================
--- index.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ index.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030421">
-<!ENTITY releasedate "April 21st, 2003">
+<!ENTITY version "0.99.2">
+<!ENTITY releasedate "April 22nd, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/core/arts.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -15,7 +15,8 @@
 
 <para>It will use the following recommended packages, if installed:
-<screen><xref linkend="alsa"/>, <xref linkend="audiofile"/>, and <xref linkend="libvorbis"/>.</screen></para>
+<screen><xref linkend="alsa"/>, <xref linkend="audiofile"/>, and <xref linkend="libvorbis"/></screen></para>
 
-<para>Before starting the build, ensure you have the QTDIR environment variable set
+<para>Before starting the build, ensure you have the
+<envar>QTDIR</envar> environment variable set
 <screen><userinput>export QTDIR=/opt/qt</userinput></screen></para>
 
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/core/config.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -6,5 +6,5 @@
 <screen><userinput>ln -sf &kde-dir; /opt/kde</userinput></screen></para>
 
-<para>Then create an .xinitrc file to start KDE:
+<para>Then create an <filename>.xinitrc</filename> file to start KDE:
 <screen><userinput>echo "exec startkde" &gt; ~/.xinitrc</userinput></screen>
 and ensure all libraries can be found with:
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-addons.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdeaddons depends on:
-<screen><xref linkend="kde-multimedia"/> and <xref linkend="kde-network"/>.</screen></para>
+<screen><xref linkend="kde-multimedia"/> and <xref linkend="kde-network"/></screen></para>
 
 <para>Install kdeaddons with:
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-admin.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,7 +10,7 @@
 
 <para>kdeadmin depends on:
-<screen><xref linkend="kde-base"/>.
-The kpackage program can use <filename>rpm</filename>.
-kuser can use <filename>shadow</filename> and <xref linkend="Linux_PAM"/>.</screen></para>
+<screen><xref linkend="kde-base"/>
+The kpackage program can use <application>rpm</application>
+kuser can use <application>shadow</application> and <xref linkend="Linux_PAM"/></screen></para>
 
 <para>Install kdeadmin with:
Index: kde/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-artwork.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdeartwork depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>Install kdeartwork with:
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-base.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 recommended:
 <screen><xref linkend="openssl"/>, <xref linkend="lesstif"/>, <xref linkend="CDParanoia"/>, <xref linkend="libvorbis"/>,
-shadow (in the LFS book), and <xref linkend="cups"/>.</screen></para>
+shadow (in the LFS book), and <xref linkend="cups"/></screen></para>
 
 <para>Other programs and libraries that can be used by kdebase are:
Index: kde/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-edu.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdeedu depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>Install kdeedu with:
Index: kde/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-games.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdegames depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>Install kdegames with:
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-graphics.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,7 +10,7 @@
 
 <para>kdegraphics depends on:
-<screen><xref linkend="kde-base"/> and <xref linkend="which"/> (or the which script).
-The kuickshow program requires <xref linkend="imlib"/>.
-The kooka program requires <xref linkend="sane"/>.</screen></para>
+<screen><xref linkend="kde-base"/> and <xref linkend="which"/> (or the which script)
+The kuickshow program requires <xref linkend="imlib"/>
+The kooka program requires <xref linkend="sane"/></screen></para>
 
 <para>Install kdegraphics with:
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-libs.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -20,8 +20,8 @@
 <para>kdelibs can use many libraries and programs.  The following are recommended:
 <screen><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref linkend="libxml2"/>,
-<xref linkend="libxslt"/>, <xref linkend="libfam"/>, and <xref linkend="libart_lgpl"/>.</screen></para>
+<xref linkend="libxslt"/>, <xref linkend="libfam"/>, and <xref linkend="libart_lgpl"/></screen></para>
 
 <para>Other optional programs and libraries that can be used by kdelibs are:
-<screen><xref linkend="cups"/>, <xref linkend="sane"/>, and <xref linkend="openldap"/>.</screen></para>
+<screen><xref linkend="cups"/>, <xref linkend="sane"/>, and <xref linkend="openldap"/></screen></para>
 
 <para>Install kdelibs with:
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-multimedia.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdemultimedia depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>Install kdemultimedia with:
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-network.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdenetwork depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>Install kdenetwork with:
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-pim.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdepim depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>The kpilot application depends on <filename>pilot-link</filename> 
Index: kde/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ kde/inst/kde-utils.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,5 @@
 
 <para>kdeutils depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
+<screen><xref linkend="kde-base"/></screen></para>
 
 <para>Install kdeutils with:
Index: multimedia/audioutils/cdparanoia/cdparanoia-desc.xml
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/audioutils/cdparanoia/cdparanoia-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -3,5 +3,5 @@
 
 <para>The CDParanoia package contains <userinput>cdparanoia</userinput>
-and the <filename>libcdda</filename> library.</para>
+and the <filename>libcdda</filename> libraries.</para>
 
 </sect2>
Index: multimedia/audioutils/mpg123/mpg123-intro.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/audioutils/mpg123/mpg123-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -12,5 +12,5 @@
 
 <screen>mpg123 depends on:
-<xref linkend="alsa"/> with oss-compatibility.</screen>
+<xref linkend="alsa-oss"/></screen>
 
 </sect2>
Index: multimedia/libdriv/alsa/lib/alsa-lib-intro.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -11,5 +11,6 @@
 programs (including alsa-utils) which wish to use the alsa sound interface.</para>
 
-<screen>alsa-lib depends on the header files from <xref linkend="alsa-driver"/></screen>
+<screen>alsa-lib depends on: 
+the header files from <xref linkend="alsa-driver"/></screen>
 
 </sect2>
Index: multimedia/libdriv/alsa/tools/alsa-tools-intro.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,6 @@
 <para>The alsa-tools package contains advanced tools for certain soundcards.</para>
 
-<screen>alsa-tools depends on <xref linkend="alsa-lib"/>.</screen>
+<screen>alsa-tools depends on: 
+<xref linkend="alsa-lib"/></screen>
 
 </sect2>
Index: multimedia/libdriv/alsa/utils/alsa-utils-intro.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -11,5 +11,6 @@
 controlling your sound card.</para>
 
-<screen>alsa-utils depends on <xref linkend="alsa-lib"/>.</screen>
+<screen>alsa-utils depends on: 
+<xref linkend="alsa-lib"/></screen>
 
 </sect2>
Index: multimedia/libdriv/audiofile/audiofile-desc.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/audiofile/audiofile-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The audiofile package contains <filename>audiofile</filename> libraries,
+<para>The audiofile package contains <filename>libaudiofile</filename> libraries,
 <userinput>audiofile-config</userinput>, <userinput>sfinfo
 </userinput>and <userinput>sfconvert</userinput>.</para>
Index: multimedia/libdriv/esound/esound-desc.xml
===================================================================
--- multimedia/libdriv/esound/esound-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/esound/esound-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -6,5 +6,5 @@
 <userinput>esdloop</userinput>, <userinput>esdmon</userinput>,
 <userinput>esdrec</userinput>, <userinput>esdsample</userinput> and
-<filename>esd</filename> libraries.</para>
+<filename>libesd</filename> libraries.</para>
 
 </sect2>
Index: multimedia/libdriv/libao/libao-desc.xml
===================================================================
--- multimedia/libdriv/libao/libao-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/libao/libao-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libao package contains <filename>ao</filename> libraries.</para>
+<para>The libao package contains <filename>libao</filename> libraries.</para>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-desc.xml
===================================================================
--- multimedia/libdriv/nas/nas-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/libdriv/nas/nas-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The nas package contains <filename>nas</filename> utils, headers and libraries.</para>
+<para>The nas package contains <application>nas</application> utils, headers and libraries.</para>
 
 </sect2>
Index: multimedia/videoutils/ffmpeg/ffmpeg-desc.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -3,6 +3,7 @@
 
 <para>The ffmpeg package contains <userinput>ffmpeg</userinput>,
-<userinput>ffserver</userinput>, <userinput>libavcodec</userinput> and 
-<userinput>libavformat</userinput>.</para>
+<userinput>ffserver</userinput>, <filename>libavcodec</filename>
+libraries and 
+<filename>libavformat</filename> libraries.</para>
 
 </sect2>
Index: multimedia/videoutils/transcode/transcode-inst.xml
===================================================================
--- multimedia/videoutils/transcode/transcode-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ multimedia/videoutils/transcode/transcode-inst.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -36,7 +36,8 @@
 make install</userinput></screen></para>
 
+<!--
 <para>Replace <userinput>&lt;version&gt;</userinput> with whichever
 MPlayer Version number is appropriate.</para>
-
+-->
 </sect3>
 
Index: pst/printing/lprng/lprng-config.xml
===================================================================
--- pst/printing/lprng/lprng-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ pst/printing/lprng/lprng-config.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -66,5 +66,5 @@
 
 <para>Create the symbolic links to the lprng init script in the relevant
-rc.d directories with the following commands:
+<filename>rc.d</filename> directories with the following commands:
 <screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/lpd ../rc0.d/K00lprng &amp;&amp;
Index: pst/scanning/xsane/xsane-intro.xml
===================================================================
--- pst/scanning/xsane/xsane-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ pst/scanning/xsane/xsane-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -13,5 +13,6 @@
 
 <screen>xsane depends on:
-<xref linkend="sane"/>, <xref linkend="xfree86"/>, <xref linkend="libpng"/>, <xref linkend="GTK"/> and <xref linkend="gimp"/></screen>
+<xref linkend="sane"/>, <xref linkend="xfree86"/>, <xref linkend="libpng"/>, 
+<xref linkend="GTK"/> and <xref linkend="gimp"/></screen>
 
 </sect2>
Index: xsoft/graphweb/galeon/galeon-desc.xml
===================================================================
--- xsoft/graphweb/galeon/galeon-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/graphweb/galeon/galeon-desc.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -10,5 +10,6 @@
 
 <sect3><title>galeon</title>
-<para>galeon sets LD_LIBRARY_PATH and MOZILLA_FIVE_HOME before executing
+<para>galeon sets <envar>LD_LIBRARY_PATH</envar> and
+<envar>MOZILLA_FIVE_HOME</envar> before executing
 <filename>galeon-bin</filename>.</para></sect3>
 
Index: xsoft/office/abiword/abiword-intro.xml
===================================================================
--- xsoft/office/abiword/abiword-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/office/abiword/abiword-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -14,5 +14,6 @@
 <xref linkend="GLib"/> and <xref linkend="GTK"/>
 AbiWord will utilize:
-<xref linkend="expat"/>, <xref linkend="libpng"/>, <xref linkend="popt"/>, <xref linkend="gnome-libs"/>, <xref linkend="gnome-vfs1"/>, <xref linkend="gdk"/>, 
+<xref linkend="expat"/>, <xref linkend="libpng"/>, <xref linkend="popt"/>, 
+<xref linkend="gnome-libs"/>, <xref linkend="gnome-vfs1"/>, <xref linkend="gdk"/>, 
 <xref linkend="gal"/>, <xref linkend="bonobo14"/>, <xref
 linkend="gnome-print"/> and ispell</screen>
Index: xsoft/office/gimp/gimp-intro.xml
===================================================================
--- xsoft/office/gimp/gimp-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/office/gimp/gimp-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -19,7 +19,7 @@
 <xref linkend="GTK"/>
 gimp will utilize:
-<xref linkend="libtiff"/>, <xref linkend="libpng"/>, <xref
-linkend="libjpeg"/>, <xref linkend="aalib"/>, <ulink url="http://starship.python.net/~gward/mpeglib/mpeg_lib-1.3.1.tar.gz">mpeg_lib-1.3.1</ulink>, <xref linkend="Python"/> 
-and <xref linkend="perl-modules"/>:Gtk-Perl-&Gtk-Perl-version;, PDL-&PDL-version; and Parse-RecDescent-&Parse-RecDescent-version;</screen>
+<xref linkend="libtiff"/>, <xref linkend="libpng"/>, <xref linkend="libjpeg"/>, 
+<xref linkend="aalib"/>, <ulink url="http://starship.python.net/~gward/mpeglib/mpeg_lib-1.3.1.tar.gz">mpeg_lib-1.3.1</ulink>, <xref linkend="Python"/> and 
+<xref linkend="perl-modules"/>:Gtk-Perl-&Gtk-Perl-version;, PDL-&PDL-version; and Parse-RecDescent-&Parse-RecDescent-version;</screen>
 
 </sect2>
Index: xsoft/office/gnumeric/gnumeric-intro.xml
===================================================================
--- xsoft/office/gnumeric/gnumeric-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/office/gnumeric/gnumeric-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -13,7 +13,9 @@
 
 <screen>gnumeric depends on:
-<xref linkend="libxml"/>, <xref linkend="gnome-libs"/>, libole2-0.2.4, <xref linkend="gnome-print"/> and <xref linkend="gal"/>
+<xref linkend="libxml"/>, <xref linkend="gnome-libs"/>, libole2-0.2.4, 
+<xref linkend="gnome-print"/> and <xref linkend="gal"/>
 gnumeric will utilize:
-<xref linkend="Python"/>, guile &gt;= 1.5, <xref linkend="bonobo14"/>, gb &gt;=0.0.17, gda &gt; 0.2.92, <xref linkend="guppi"/> and <xref linkend="evolution"/></screen>
+<xref linkend="Python"/>, guile &gt;= 1.5, <xref linkend="bonobo14"/>, gb &gt;=0.0.17, 
+gda &gt; 0.2.92, <xref linkend="guppi"/> and <xref linkend="evolution"/></screen>
 
 </sect2>
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/suites/koffice.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -12,5 +12,5 @@
 
 <screen>KOffice depends on:
-<xref linkend="kde-base"/>.</screen>
+<xref linkend="kde-base"/></screen>
 
 <para>KOffice also has many internationalization packages in the form of:
Index: xsoft/suites/openoffice/openoffice-inst.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/suites/openoffice/openoffice-inst.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -2,8 +2,11 @@
 <title>Installation of openoffice</title>
 
-<para>Note that openoffice has problems with <userinput>bison-1.875</userinput>. Downgrade to
-<userinput>bison-1.75</userinput> or install bison-1.75 with an alternate
-prefix (e.g. <filename>/opt/bison-1.75</filename>) and put $bison_prefix/bin as the first
-entry in the PATH.</para>
+<para>Note that openoffice has problems with
+<application>bison-1.875</application>. Downgrade to
+<application>bison-1.75</application> or install
+<application>bison-1.75</application> with an alternate
+prefix (e.g. <filename>/opt/bison-1.75</filename>) and put <filename
+class="directory">$bison_prefix/bin</filename> as the first
+entry in the <envar>PATH</envar>.</para>
 
 <para>Apply the downloaded patches and copy gpc files.</para>
@@ -17,5 +20,5 @@
 <para>If you want to optimize the build, edit
 <filename>solenv/inc/unxlngi4.mk</filename> and add the desired optimization
-flags to CFLAGSOPT variable. Some users have reported problems with
+flags to <envar>CFLAGSOPT</envar> variable. Some users have reported problems with
 -fomit-frame-pointer. The best option is to not use any custom optimizations.
 The following command removes an incorrect -mcpu option in the above file.</para>
Index: xsoft/suites/openoffice/openoffice-intro.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ xsoft/suites/openoffice/openoffice-intro.xml	(revision df106b1000e103e2bab7fa687c5b13d926d826c7)
@@ -23,6 +23,5 @@
 
 <para>Download the General Polygon Clipper Library from <ulink
-url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/>
-</para>
+url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/>.</para>
 
 <para>Also download the various patches from <userinput><ulink url="&hfile-root;"/></userinput>.
@@ -42,8 +41,8 @@
 hint also discusses installation of auxiliary software.
 </para>
-
+<!--
 <note><para>There is a problem with the current version of OO on LFS.
 The build and installation appears to be successful but no files are installed.
 The cause is being investigated.</para></note>
-
+-->
 </sect2>
