Index: basicnet/mailnews/mutt/mutt-config.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ basicnet/mailnews/mutt/mutt-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -15,7 +15,7 @@
 
 <para>In order to utilize <application>GnuPG</application>, use the following 
-command:
+command:</para>
 <screen><userinput><command>cat /usr/share/doc/mutt/samples/gpg.rc &gt;&gt;
-~/.muttrc</command></userinput></screen></para>
+~/.muttrc</command></userinput></screen>
 </sect3>
 
Index: basicnet/mailnews/mutt/mutt-inst.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ basicnet/mailnews/mutt/mutt-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -3,11 +3,11 @@
 
 <para><application>Mutt</application> requires a group named 'mail'.  You can 
-add this group, if it does not exist, with this command:
-<screen><userinput><command>groupadd mail</command></userinput></screen></para>
+add this group, if it does not exist, with this command:</para>
+<screen><userinput><command>groupadd mail</command></userinput></screen>
 
 <para>If you did not install a <acronym>MTA</acronym>, such as <xref 
 linkend="postfix"/> or <xref linkend="sendmail"/>, you need to modify the 
-ownership of <filename>/var/mail</filename> with this command:
-<screen><userinput><command>chgrp mail /var/mail</command></userinput></screen></para> 
+ownership of <filename>/var/mail</filename> with this command:</para>
+<screen><userinput><command>chgrp mail /var/mail</command></userinput></screen>
 
 <para>Install <application>Mutt</application> by running the following commands:</para>
Index: basicnet/mailnews/slrn/slrn-config.xml
===================================================================
--- basicnet/mailnews/slrn/slrn-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ basicnet/mailnews/slrn/slrn-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -15,5 +15,5 @@
 command:</para>
 
-<para><screen><userinput><command>slrn -f $HOME/.jnewsrc --create</command></userinput></screen></para>
+<screen><userinput><command>slrn -f $HOME/.jnewsrc --create</command></userinput></screen>
 
 </sect3>
Index: basicnet/mailnews/slrn/slrn-inst.xml
===================================================================
--- basicnet/mailnews/slrn/slrn-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ basicnet/mailnews/slrn/slrn-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>slrn</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --with-slrnpull &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --with-slrnpull &amp;&amp;
 make LDFLAGS="-ldl" &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netutils/nmap/nmap-inst.xml
===================================================================
--- basicnet/netutils/nmap/nmap-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ basicnet/netutils/nmap/nmap-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>Nmap</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netutils/whois/whois-inst.xml
===================================================================
--- basicnet/netutils/whois/whois-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ basicnet/netutils/whois/whois-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,6 +4,6 @@
 <para>Install <application>Whois</application> by running the following commands:</para>
 
-<para><screen><userinput><command>make &amp;&amp;
-make prefix=/usr install</command></userinput></screen></para>
+<screen><userinput><command>make &amp;&amp;
+make prefix=/usr install</command></userinput></screen>
 
 </sect2>
Index: connect/dialup/wvdial/wvdial-config.xml
===================================================================
--- connect/dialup/wvdial/wvdial-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ connect/dialup/wvdial/wvdial-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring WvDial</title>
+<title>Configuring <application>WvDial</application></title>
 
 <sect3><title>Config files</title>
@@ -8,13 +8,13 @@
 <sect3><title>Configuration Information</title>
 
-<para><screen><userinput><command>touch /etc/wvdial.conf &amp;&amp;
+<screen><userinput><command>touch /etc/wvdial.conf &amp;&amp;
 wvdialconf /etc/wvdial.conf</command></userinput></screen>
-<command>wvdialconf</command> will test that you have a working modem 
+<para><command>wvdialconf</command> will test that you have a working modem 
 and try to determine it's exact setup. You will then need to enter your
 <acronym>ISP</acronym>'s phone number, login name and password into the
 <filename>/etc/wvdial.conf</filename> file.</para>
 
-<para>You then start wvdial with:
-<screen><userinput><command>wvdial</command></userinput></screen></para>
+<para>You then start wvdial with:</para>
+<screen><userinput><command>wvdial</command></userinput></screen>
 
 <para>For more information examine the wvdialconf, wvdial.conf and wvdial man pages.</para>
Index: connect/other/pppoe/pppoe-config.xml
===================================================================
--- connect/other/pppoe/pppoe-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ connect/other/pppoe/pppoe-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -73,5 +73,5 @@
 chmod 755 /etc/rc.d/init.d/adsl</command></userinput></screen>
 
-<para>Now create the necessary symlinks:
+<para>Now create the necessary symlinks:</para>
 <screen><userinput><command>ln -sf ../init.d/adsl /etc/rc.d/rc0.d/K49adsl &amp;&amp;
 ln -sf ../init.d/adsl /etc/rc.d/rc1.d/K49adsl &amp;&amp;
@@ -80,5 +80,5 @@
 ln -sf ../init.d/adsl /etc/rc.d/rc4.d/S24adsl &amp;&amp;
 ln -sf ../init.d/adsl /etc/rc.d/rc5.d/S24adsl &amp;&amp;
-ln -sf ../init.d/adsl /etc/rc.d/rc6.d/K49adsl</command></userinput></screen></para>
+ln -sf ../init.d/adsl /etc/rc.d/rc6.d/K49adsl</command></userinput></screen>
 
 </sect3>
Index: content/web/proftpd/proftpd-config.xml
===================================================================
--- content/web/proftpd/proftpd-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ content/web/proftpd/proftpd-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -10,5 +10,5 @@
  for example configurations.</para>
 
-<para><screen><userinput><command>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"</command>
 # This is a basic ProFTPD configuration file
 # It establishes a single server and a single anonymous login.
@@ -61,10 +61,10 @@
   &lt;/Limit&gt;
 &lt;/Anonymous&gt;
-<command>EOF</command></userinput></screen></para></sect3>
+<command>EOF</command></userinput></screen></sect3>
 
 
 <sect3><title>proftpd init.d script</title>
 
-<para><screen><userinput><command>cat &gt; /etc/rc.d/init.d/proftpd &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/proftpd &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/proftpd
@@ -110,8 +110,9 @@
 # End $rc_base/init.d/proftpd
 <command>EOF
-chmod 755 /etc/rc.d/init.d/proftpd</command></userinput></screen></para>
+chmod 755 /etc/rc.d/init.d/proftpd</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant <filename
-class="directory">rc.d</filename> directories with the following commands:
+class="directory">rc.d</filename> directories with the following
+commands:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/proftpd ../rc0.d/K50proftpd &amp;&amp;
@@ -121,5 +122,5 @@
 ln -sf ../init.d/proftpd ../rc4.d/S50proftpd &amp;&amp;
 ln -sf ../init.d/proftpd ../rc5.d/S50proftpd &amp;&amp;
-ln -sf ../init.d/proftpd ../rc6.d/K50proftpd</command></userinput></screen></para>
+ln -sf ../init.d/proftpd ../rc6.d/K50proftpd</command></userinput></screen>
 
 </sect3>
Index: content/web/proftpd/proftpd-inst.xml
===================================================================
--- content/web/proftpd/proftpd-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ content/web/proftpd/proftpd-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -5,15 +5,15 @@
 as an unpriviledged user and group is encouraged.</para>
 
-<para><screen><userinput><command>groupadd proftpd &amp;&amp;
+<screen><userinput><command>groupadd proftpd &amp;&amp;
 useradd -c proftd -d /home/ftp -g proftpd -s /bin/false proftpd</command>
-</userinput></screen></para>
+</userinput></screen>
 
-<para>Install ProFTPD by running the following commands:</para>
+<para>Install <application>ProFTPD</application> by running the following commands:</para>
 
-<para><screen><userinput><command>install_user=proftpd install_group=proftpd \
+<screen><userinput><command>install_user=proftpd install_group=proftpd \
 &nbsp;&nbsp;&nbsp;./configure --prefix=/usr --sysconfdir=/etc \
 &nbsp;&nbsp;&nbsp;--localstatedir=/var &amp;&amp;
 make &amp;&amp;
-make install </command></userinput></screen></para>
+make install </command></userinput></screen>
 
 </sect2>
Index: general/genlib/expat/expat-inst.xml
===================================================================
--- general/genlib/expat/expat-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/genlib/expat/expat-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -2,13 +2,14 @@
 <title>Installation of <application>expat</application></title>
 
-<para>The <filename>expat.h</filename> declares XML_Status after its first use.  This is corrected by the following patch:
+<para>The <filename>expat.h</filename> declares XML_Status after its
+first use.  This is corrected by the following patch:</para>
 
-<screen><userinput><command>patch -Np1 -i ../expat-1.95.6.patch</command></userinput></screen></para>
+<screen><userinput><command>patch -Np1 -i ../expat-1.95.6.patch</command></userinput></screen>
 
 <para>Install <application>expat</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/glib/glib-inst.xml
===================================================================
--- general/genlib/glib/glib-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/genlib/glib/glib-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>glib</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/popt/popt-inst.xml
===================================================================
--- general/genlib/popt/popt-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/genlib/popt/popt-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>popt</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/slang/slang-inst.xml
===================================================================
--- general/genlib/slang/slang-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/genlib/slang/slang-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,5 +4,5 @@
 <para>Install <application>slang</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -10,5 +10,5 @@
 make install-elf &amp;&amp;
 make install-links &amp;&amp;
-chmod 755 /usr/lib/libslang.so.&slang-version;</command></userinput></screen></para>
+chmod 755 /usr/lib/libslang.so.&slang-version;</command></userinput></screen>
 
 </sect2>
Index: general/graphlib/libjpeg/libjpeg-inst.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/graphlib/libjpeg/libjpeg-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>libjpeg</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --enable-static --enable-shared --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --enable-static --enable-shared --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/graphlib/libtiff/libtiff-inst.xml
===================================================================
--- general/graphlib/libtiff/libtiff-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/graphlib/libtiff/libtiff-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,8 +4,8 @@
 <para>Install <application>libtiff</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --noninteractive \
+<screen><userinput><command>./configure --prefix=/usr --noninteractive \
    --with-DIR_MAN=/usr/share/man &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/prog/perl/perl-modules-inst.xml
===================================================================
--- general/prog/perl/perl-modules-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/prog/perl/perl-modules-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -12,5 +12,5 @@
 broken at the present time.</para>
 
-<para>Gtk-Perl-&Gtk-Perl-version;:
+<para>Gtk-Perl-&Gtk-Perl-version;:</para>
 <screen><userinput><command>perl Makefile.PL --without-guessing &amp;&amp;
 make
@@ -20,5 +20,5 @@
 sed '/^OBJECT/s/build/./g' Gtk/Makefile.bak > Gtk/Makefile &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 
Index: general/prog/python/python-inst.xml
===================================================================
--- general/prog/python/python-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/prog/python/python-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>Python</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --enable-shared &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --enable-shared &amp;&amp;
 make &amp;&amp;
-make install </command></userinput></screen></para>
+make install </command></userinput></screen>
 
 </sect2>
Index: general/sysutils/gpm/gpm-config.xml
===================================================================
--- general/sysutils/gpm/gpm-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/sysutils/gpm/gpm-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -62,5 +62,5 @@
 
 <para>You then need to create symbolic links to this file in the
-relevant <filename>rc.d</filename> directories.  For example:
+relevant <filename>rc.d</filename> directories.  For example:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/gpm ../rc0.d/K10gpm &amp;&amp;
@@ -70,5 +70,6 @@
 ln -sf ../init.d/gpm ../rc4.d/S70gpm &amp;&amp;
 ln -sf ../init.d/gpm ../rc5.d/S70gpm &amp;&amp;
-ln -sf ../init.d/gpm ../rc6.d/K10gpm</command></userinput></screen></para></sect3>
+ln -sf ../init.d/gpm ../rc6.d/K10gpm</command></userinput></screen>
+</sect3>
 
 <sect3><title>Config files</title>
@@ -79,6 +80,6 @@
 <screen><userinput><command>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"</command> 
 # start /etc/sysconfig/mouse
-MDEVICE=yourdevice
-PROTOCOL=yourprotocol
+MDEVICE=<replaceable>[yourdevice]</replaceable>
+PROTOCOL=<replaceable>[yourprotocol]</replaceable>
 # end /etc/sysconfig/mouse
 <command>EOF</command></userinput></screen>
Index: general/sysutils/pkgconfig/pkgconfig-config.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/sysutils/pkgconfig/pkgconfig-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -2,6 +2,6 @@
 <title>Configuring <application>pkgconfig</application></title>
 
-<para>Add to your system or personal profile:
-<screen><userinput><command>export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</command></userinput></screen></para>
+<para>Add to your system or personal profile:</para>
+<screen><userinput><command>export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</command></userinput></screen>
 
 <para>The default settings for <envar>PKG_CONFIG_PATH</envar> are
Index: general/sysutils/pkgconfig/pkgconfig-inst.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>pkgconfig</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/gnome-intro.xml
===================================================================
--- gnome/gnome-intro.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/gnome-intro.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -25,6 +25,7 @@
 
 <para>If you choose the second option, removal of GNOME-2.2 is as easy
-as removing the edits from the pre-installation page and issueing the following command:
-<screen><userinput><command>rm /opt/gnome-&gnome-version; -r </command></userinput></screen></para>
+as removing the edits from the pre-installation page and issueing the
+following command:</para>
+<screen><userinput><command>rm /opt/gnome-&gnome-version; -r </command></userinput></screen>
 
 <para>If your system was completely built per <acronym>LFS</acronym> and
Index: gnome/lib/bonobo/bonobo-activation-inst.xml
===================================================================
--- gnome/lib/bonobo/bonobo-activation-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/lib/bonobo/bonobo-activation-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,8 +4,8 @@
 <para>Install <application>bonobo-activation</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
 --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/intltool/intltool-inst.xml
===================================================================
--- gnome/lib/intltool/intltool-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/lib/intltool/intltool-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>intltool</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/lib-config.xml
===================================================================
--- gnome/lib/lib-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/lib/lib-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,8 +4,8 @@
 
 <para>Set an Environment variable to resolve the prefix destination.</para>  
-<para>If GNOME is your desktop of choice:
+<para>If GNOME is your desktop of choice:</para>
 <screen><userinput><command>export GNOME_PREFIX=/usr</command></userinput></screen>
-If you want to try-out GNOME:
-<screen><userinput><command>export GNOME_PREFIX=/opt/gnome-&gnome-version;</command></userinput></screen></para>
+<para>If you want to try-out GNOME:</para>
+<screen><userinput><command>export GNOME_PREFIX=/opt/gnome-&gnome-version;</command></userinput></screen>
 
 <para>The try-out group will also need to make all the following
Index: gnome/lib/libidl/libidl-inst.xml
===================================================================
--- gnome/lib/libidl/libidl-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/lib/libidl/libidl-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>libIDL</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/linc/linc-inst.xml
===================================================================
--- gnome/lib/linc/linc-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/lib/linc/linc-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>linc</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=$GNOME_PREFIX --with-openssl --disable-gtk-doc &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --with-openssl --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/other/gdm/gdm-config.xml
===================================================================
--- gnome/other/gdm/gdm-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/other/gdm/gdm-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -17,6 +17,6 @@
 password    required    pam_unix.so
 session     required    pam_unix.so
-<command>EOF</command></userinput></screen>
-<screen><userinput><command>cat &gt; /etc/pam.d/gdm-autologin &lt;&lt; "EOF"</command>
+<command>EOF
+cat &gt; /etc/pam.d/gdm-autologin &lt;&lt; "EOF"</command>
 auth        required    pam_env.so
 auth        required    pam_nologin.so
@@ -30,5 +30,7 @@
 
 <para>To automate the running of <command>gdm</command>, use the following command to
-create the init.d script if your GNOME_PREFIX=/opt/gnome-&gnome-version;.  The fully qualified paths can be removed for GNOME_PREFIX=/usr:
+create the init.d script if your
+GNOME_PREFIX=/opt/gnome-&gnome-version;.  The fully qualified paths can
+be removed for GNOME_PREFIX=/usr:</para>
 <screen><userinput><command>cat &gt; /etc/rc.d/init.d/gdm &lt;&lt; "EOF"</command>
 #!/bin/bash
@@ -72,9 +74,9 @@
 # End $rc_base/init.d/gdm
 <command>EOF
-chmod 755 /etc/rc.d/init.d/gdm</command></userinput></screen></para>
+chmod 755 /etc/rc.d/init.d/gdm</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant
 <filename>rc.d</filename>
-directory with the following commands:
+directory with the following commands:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/gdm ../rc0.d/K05gdm &amp;&amp;
@@ -84,11 +86,11 @@
 ln -sf ../init.d/gdm ../rc4.d/K05gdm &amp;&amp;
 ln -sf ../init.d/gdm ../rc5.d/S95gdm &amp;&amp;
-ln -sf ../init.d/gdm ../rc6.d/K05gdm</command></userinput></screen></para>
+ln -sf ../init.d/gdm ../rc6.d/K05gdm</command></userinput></screen>
 
 <para>To autostart with a graphical login, edit
-<filename>/etc/inittab</filename> so that the line reading
+<filename>/etc/inittab</filename> so that the line reading</para>
 <screen>id:3:initdefault:</screen>
-is changed to 
-<screen>id:5:initdefault:</screen></para>
+<para>is changed to</para>
+<screen>id:5:initdefault:</screen>
 
 </sect3>
Index: gnome/otherlibs/gnome-print/gnome-print-inst.xml
===================================================================
--- gnome/otherlibs/gnome-print/gnome-print-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ gnome/otherlibs/gnome-print/gnome-print-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -5,5 +5,5 @@
 interpret that <application>libxml</application>-&libxml-version; is
 newer than <application>libxml</application>-1.8.8. This can be solved
-by building <filename>xmlConf.sh</filename> with this command:
+by building <filename>xmlConf.sh</filename> with this command:</para>
 <screen><userinput><command>cat &gt; /opt/gnome/lib/xmlConf.sh &lt;&lt; EOF</command>
 XML_LIBDIR="-L/usr/lib"
@@ -11,5 +11,5 @@
 XML_INCLUDEDIR="-I/usr/include/gnome-xml"
 MODULE_VERSION=xml-&libxml-version;
-<command>EOF</command></userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>Install <application>gnome-print</application> by running the following 
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/core/arts.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -35,6 +35,6 @@
 
 <para>Before starting the build, ensure you have the 
-<envar>QTDIR</envar> environment variable set:
-<screen><userinput><command>export QTDIR=/opt/qt</command></userinput></screen></para>
+<envar>QTDIR</envar> environment variable set:</para>
+<screen><userinput><command>export QTDIR=/opt/qt</command></userinput></screen>
 
 <para>Install <application>aRts</application> by running the
@@ -83,5 +83,5 @@
 should appear in <filename>/etc/ld.so.conf</filename> 
 so that ldd can find the shared libraries. The following command will add it 
-if it is missing:
+if it is missing:</para>
 
 <screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
@@ -92,5 +92,5 @@
 # End kde addition
 EOF
-ldconfig</command></userinput></screen></para>
+ldconfig</command></userinput></screen>
 
 </sect3>
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/core/config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -5,17 +5,17 @@
 <para>
 First add <filename class="directory">/opt/kde/bin</filename> to
-your <envar>PATH</envar> environment variable:
+your <envar>PATH</envar> environment variable:</para>
 <screen><userinput><command>export PATH=$PATH:/opt/kde/bin</command></userinput></screen>
-</para>
+
 
 <para>
-Then create an <filename>.xinitrc</filename> file to start <acronym>KDE</acronym>:
+Then create an <filename>.xinitrc</filename> file to start
+<acronym>KDE</acronym>:</para>
 <screen><userinput><command>echo "exec startkde" &gt; ~/.xinitrc</command></userinput></screen>
-and ensure all libraries can be found with:
+<para>and ensure all libraries can be found with:</para>
 <screen><userinput><command>ldconfig</command></userinput></screen>
-</para>
 
-<para>At this point you can bring up <acronym>KDE</acronym> with:
-<screen><userinput><command>startx</command></userinput></screen></para>
+<para>At this point you can bring up <acronym>KDE</acronym> with:</para>
+<screen><userinput><command>startx</command></userinput></screen>
 
 </sect1>
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-addons.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -29,9 +29,9 @@
 <title>Installation of <application>kdeaddons</application></title>
 
-<para>Install <application>kdeaddons</application> with:
+<para>Install <application>kdeaddons</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-admin.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -29,9 +29,9 @@
 <title>Installation of <application>kdeadmin</application></title>
 
-<para>Install <application>kdeadmin</application> with:
+<para>Install <application>kdeadmin</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking --with-shadow &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-artwork.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -30,9 +30,9 @@
 <title>Installation of <application>kdeartwork</application></title>
 
-<para>Install <application>kdeartwork</application> with:
+<para>Install <application>kdeartwork</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-base.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -34,13 +34,13 @@
 
 <para>Check to see if <filename class="libraryfile">/lib/libmisc.la</filename> 
-exists. If not, run:
+exists. If not, run:</para>
 <screen><userinput><command>ln -sf /usr/lib/libmisc.la /lib/libmisc.la</command>
-</userinput></screen></para>
+</userinput></screen>
 
-<para>Install kdebase with:
+<para>Install kdebase with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
      --disable-dependency-tracking --disable-lametest --with-shadow &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-bindings.xml
===================================================================
--- kde/inst/kde-bindings.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-bindings.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,8 +1,8 @@
 <sect1 id="kde-bindings" xreflabel="kde-bindings-&kde-version;">
 <title>Installing kde-bindings</title>
-<para><screen>Estimated build disk space: ??? MB
+<screen>Estimated build disk space: ??? MB
 Estimated installed space:   ?? MB
 Package size:                &kde-bindings-size;
-Estimated build time:        ?? min</screen></para>
+Estimated build time:        ?? min</screen>
 
 <para>NOT YET DONE</para>
Index: kde/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-edu.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -26,9 +26,9 @@
 <title>Installation of <application>kdeedu</application></title>
 
-<para>Install <application>kdeedu</application> with:
+<para>Install <application>kdeedu</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-games.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -28,9 +28,9 @@
 <title>Installation of <application>kdegames</application></title>
 
-<para>Install <application>kdegames</application> with:
+<para>Install <application>kdegames</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-graphics.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -28,9 +28,9 @@
 <title>Installation of <application>kdegraphics</application></title>
 
-<para>Install <application>kdegraphics</application> with:
+<para>Install <application>kdegraphics</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-libs.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -43,9 +43,9 @@
 -->
 
-<para>Install <application>kdelibs</application> with:
+<para>Install <application>kdelibs</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
      --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>       
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-multimedia.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -26,9 +26,9 @@
 <title>Installation of <application>kdemultimedia</application></title>
 
-<para>Install <application>kdemultimedia</application> with:
+<para>Install <application>kdemultimedia</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking --with-arts-alsa &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-network.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -26,9 +26,9 @@
 <title>Installation of <application>kdenetwork</application></title>
 
-<para>Install <application>kdenetwork</application> with:
+<para>Install <application>kdenetwork</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-pim.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -30,9 +30,9 @@
 <title>Installation of <application>kdepim</application></title>
 
-<para>Install <application>kdepim</application> with:
+<para>Install <application>kdepim</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-sdk.xml
===================================================================
--- kde/inst/kde-sdk.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-sdk.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,8 +1,8 @@
 <sect1 id="kde-sdk" xreflabel="kde-sdk-&kde-version;">
 <title>Installing kde-sdk</title>
-<para><screen>Estimated build disk space: ??? MB
+<screen>Estimated build disk space: ??? MB
 Estimated installed space:   ?? MB
 Package size:                &kde-sdk-size;
-Estimated build time:        ?? min</screen></para>
+Estimated build time:        ?? min</screen>
 
 <para>NOT YET DONE</para>
Index: kde/inst/kde-toys.xml
===================================================================
--- kde/inst/kde-toys.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-toys.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -26,9 +26,9 @@
 <title>Installation of <application>kdetoys</application></title>
 
-<para>Install <application>kdetoys</application> with:
+<para>Install <application>kdetoys</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ kde/inst/kde-utils.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -26,9 +26,9 @@
 <title>Installation of <application>kdeutils</application></title>
 
-<para>Install <application>kdeutils</application> with:
+<para>Install <application>kdeutils</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: multimedia/cdwriteutils/udftools/udftools-kernel-inst.xml
===================================================================
--- multimedia/cdwriteutils/udftools/udftools-kernel-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ multimedia/cdwriteutils/udftools/udftools-kernel-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -8,5 +8,5 @@
 
 <para>In the kernel configuration, check your setting with those listed
-here:
+here:</para>
 
 <screen>Block devices
@@ -14,5 +14,5 @@
 File Systems
    UDF filesystems support (read only):  Y
-     UDF write support (DANGEROUS)       Y</screen></para>
+     UDF write support (DANGEROUS)       Y</screen>
 
 <para>If necessary, recompile the kernel with
@@ -36,7 +36,7 @@
 <para>Finally, create the packet driver device nodes in <filename
 class="directory">/dev</filename>, add one node for every CD-RW drive you
-want to support:
+want to support:</para>
 <screen><userinput><command>mknod /dev/pktcdvd0 b97 0
-mknod /dev/pktcdvd1 b 97 1</command></userinput></screen></para>
+mknod /dev/pktcdvd1 b 97 1</command></userinput></screen>
 
 </sect2>
Index: multimedia/libdriv/alsa/driver/alsa-driver-config.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -34,10 +34,10 @@
 <para>After editing <filename>/etc/modules.conf</filename> you need to run
 <command>depmod</command>.  If the drivers you have compiled are for the
-version of the kernel you are currently running, simply run
+version of the kernel you are currently running, simply run</para>
 <screen><userinput><command>depmod</command></userinput></screen>  
-If you are compiling  drivers for a different kernel version than those you are 
-running, you will need to use a line along the lines of:
+<para>If you are compiling  drivers for a different kernel version than those 
+you are running, you will need to use a line along the lines of:</para>
 <screen><userinput><command>depmod -a 2.4.22 -F /boot/System.map-2.4.22
-</command></userinput></screen></para>
+</command></userinput></screen>
 
 </sect3>
Index: multimedia/libdriv/alsa/driver/alsa-driver-inst.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -29,6 +29,7 @@
 <para>If this is the first time you have installed the alsa drivers, you
 will need to create the <filename class="directory">/dev</filename> entries
-using the script provided in the <acronym>ALSA</acronym>-driver source tree:
-<screen><userinput><command>./snddevices</command></userinput></screen></para>
+using the script provided in the <acronym>ALSA</acronym>-driver source
+tree:</para>
+<screen><userinput><command>./snddevices</command></userinput></screen>
 
 </sect2>
Index: multimedia/libdriv/alsa/utils/alsa-utils-config.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -68,5 +68,5 @@
 chmod 755 /etc/rc.d/init.d/alsa</command></userinput></screen>
 
-<para>You can then create the appropriate symlinks:
+<para>You can then create the appropriate symlinks:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/alsa ../rc0.d/K35alsa &amp;&amp;
@@ -76,5 +76,5 @@
 ln -sf ../init.d/alsa ../rc4.d/S40alsa &amp;&amp;
 ln -sf ../init.d/alsa ../rc5.d/S40alsa &amp;&amp;
-ln -sf ../init.d/alsa ../rc6.d/K35alsa</command></userinput></screen></para>
+ln -sf ../init.d/alsa ../rc6.d/K35alsa</command></userinput></screen>
 
 <para>Note that all channels of your soundcard are muted by default. You can
@@ -86,7 +86,7 @@
 there is no state in <filename>/etc/asound.state</filename>.  You can
 prevent this by running the following commands after installing
-<application><acronym>ALSA</acronym>-utils</application>:
+<application><acronym>ALSA</acronym>-utils</application>:</para>
 <screen><userinput><command>touch /etc/asound.state &amp;&amp;
-alsactl store</command></userinput></screen></para>
+alsactl store</command></userinput></screen>
 
 <para>A final note is that the lines loading <filename>sfxload</filename>
Index: multimedia/libdriv/esound/esound-inst.xml
===================================================================
--- multimedia/libdriv/esound/esound-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ multimedia/libdriv/esound/esound-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -5,7 +5,7 @@
 commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ postlfs/config/random.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -57,5 +57,5 @@
 <para>Create the symbolic links to this file in the relevant
 <filename class="directory">rc.d</filename> directories 
-with the following commands:
+with the following commands:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/random ../rc0.d/K45random &amp;&amp;
@@ -64,5 +64,5 @@
 ln -sf ../init.d/random ../rc4.d/S25random &amp;&amp;
 ln -sf ../init.d/random ../rc5.d/S25random &amp;&amp;
-ln -sf ../init.d/random ../rc6.d/K45random</command></userinput></screen></para>
+ln -sf ../init.d/random ../rc6.d/K45random</command></userinput></screen>
 
 
Index: postlfs/editors/vim/vim-inst.xml
===================================================================
--- postlfs/editors/vim/vim-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ postlfs/editors/vim/vim-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,8 +4,8 @@
 <para>Install <application>Vim</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr \
+<screen><userinput><command>./configure --prefix=/usr \
    --with-features=huge &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: postlfs/security/tripwire/tripwire-config.xml
===================================================================
--- postlfs/security/tripwire/tripwire-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ postlfs/security/tripwire/tripwire-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -46,8 +46,8 @@
 <sect3><title>Usage Information</title>
 <para>To use <application>Tripwire</application> after this and run a report, 
-use the following command:
+use the following command:</para>
 
 <screen><userinput><command>tripwire -m c &gt; /etc/tripwire/report.txt
-</command></userinput></screen></para>
+</command></userinput></screen>
 
 <para>View the output to check the integrity of your files. An automatic
@@ -64,6 +64,6 @@
 last report creation and is needed to update the tripwire database of your 
 system. Then, type in the following command making the appropriate 
-substitutions for '?':
-<screen><userinput><command>tripwire -m u -r /var/lib/tripwire/report/linux-???????-??????.twr </command></userinput></screen></para>
+substitutions for '?':</para>
+<screen><userinput><command>tripwire -m u -r /var/lib/tripwire/report/linux-???????-??????.twr </command></userinput></screen>
 
 <para>You will be placed into vim with a copy of the report in front of you. If 
@@ -78,7 +78,8 @@
 
 <para>If you are unhappy with your policy file and would like to modify it or 
-use a new one, modify the policy file and then execute the following commands:
+use a new one, modify the policy file and then execute the following
+commands:</para>
 <screen><userinput><command>twadmin -m P /etc/tripwire/twpol.txt &amp;&amp;
-tripwire -m i</command></userinput></screen></para>
+tripwire -m i</command></userinput></screen>
 
 </sect3>
Index: postlfs/security/tripwire/tripwire-inst.xml
===================================================================
--- postlfs/security/tripwire/tripwire-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ postlfs/security/tripwire/tripwire-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -20,7 +20,7 @@
 cp policy/*.txt /usr/share/doc/tripwire</command></userinput></screen>
 
-<para>Reverse the modifications made above:
+<para>Reverse the modifications made above:</para>
 <screen><userinput><command>rm /usr/bin/gmake &amp;&amp;
-export PATH=$PATH_HOLD</command></userinput></screen></para>
+export PATH=$PATH_HOLD</command></userinput></screen>
 
 </sect2>
Index: pst/printing/lprng/lprng-config.xml
===================================================================
--- pst/printing/lprng/lprng-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ pst/printing/lprng/lprng-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -66,5 +66,6 @@
 
 <para>Create the symbolic links to the lprng init script in the relevant
-<filename>rc.d</filename> directories with the following commands:
+<filename>rc.d</filename> directories with the following
+commands:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/lpd ../rc0.d/K00lprng &amp;&amp;
@@ -74,5 +75,5 @@
 ln -sf ../init.d/lpd ../rc4.d/S99lprng &amp;&amp;
 ln -sf ../init.d/lpd ../rc5.d/S99lprng &amp;&amp;
-ln -sf ../init.d/lpd ../rc6.d/K00lprng</command></userinput></screen></para>
+ln -sf ../init.d/lpd ../rc6.d/K00lprng</command></userinput></screen>
 
 </sect3>
Index: server/mail/courier/courier-config.xml
===================================================================
--- server/mail/courier/courier-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ server/mail/courier/courier-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -103,5 +103,5 @@
 
 <screen><userinput><command>cat &gt; /etc/courier/me &lt;&lt; "EOF"</command>
-{servername.yourdomain}
+<replaceable>[servername.yourdomain]</replaceable>
 <command>EOF</command></userinput></screen>
 
@@ -110,5 +110,5 @@
 <screen><userinput><command>cat &gt; /etc/courier/locals &lt;&lt; "EOF"</command>
 localhost
-{yourdomain}
+<replaceable>[yourdomain]</replaceable>
 <command>EOF</command></userinput></screen>
 
@@ -117,5 +117,5 @@
 <screen><userinput><command>cat &gt;/etc/courier/esmtpacceptmailfor.dir/system &lt;&lt; "EOF"</command>
 localhost
-{yourdomain}
+<replaceable>[yourdomain]</replaceable>
 <command>EOF</command></userinput></screen>
 
@@ -259,7 +259,7 @@
 </application> server, you will need to add
 <filename>/etc/courier/webadmin/unsecureok</filename>, so you will be able
-to use your web based administration tool.
-
-<screen><userinput><command>touch /etc/courier/webadmin/unsecureok</command></userinput></screen></para>
+to use your web based administration tool.</para>
+
+<screen><userinput><command>touch /etc/courier/webadmin/unsecureok</command></userinput></screen>
 </sect3>
 
@@ -276,5 +276,5 @@
 
 <para>Create the symbolic links to this file in the relevant
-<filename>rc.d</filename> directory with the following commands:
+<filename>rc.d</filename> directory with the following commands:</para>
 
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
@@ -285,5 +285,5 @@
 ln -sf ../init.d/courier ../rc4.d/S35courier &amp;&amp;
 ln -sf ../init.d/courier ../rc5.d/S35courier &amp;&amp;
-ln -sf ../init.d/courier ../rc6.d/K25courier</command></userinput></screen></para>
+ln -sf ../init.d/courier ../rc6.d/K25courier</command></userinput></screen>
 
 </sect3>
Index: server/mail/courier/courier-inst.xml
===================================================================
--- server/mail/courier/courier-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ server/mail/courier/courier-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,8 +4,8 @@
 <para> Before you compile the program, you need to create users and groups that 
 will be expected to be in place when the install script executes. Add the users 
-and groups with the following commands:
+and groups with the following commands:</para>
 
 <screen><userinput><command>groupadd courier &amp;&amp;
-useradd -c 'Courier Mail Server -d /dev/null -g courier -s /bin/false courier</command></userinput></screen></para>
+useradd -c 'Courier Mail Server -d /dev/null -g courier -s /bin/false courier</command></userinput></screen>
 
 
Index: server/mail/postfix/postfix-config.xml
===================================================================
--- server/mail/postfix/postfix-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ server/mail/postfix/postfix-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -91,5 +91,5 @@
 
 <para>Create the symbolic links to this file in the relevant
-<filename>rc.d</filename> directory with the following commands:
+<filename>rc.d</filename> directory with the following commands:</para>
 
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
@@ -100,5 +100,5 @@
 ln -sf ../init.d/postfix ../rc4.d/S35postfix &amp;&amp;
 ln -sf ../init.d/postfix ../rc5.d/S35postfix &amp;&amp;
-ln -sf ../init.d/postfix ../rc6.d/K25postfix</command></userinput></screen></para>
+ln -sf ../init.d/postfix ../rc6.d/K25postfix</command></userinput></screen>
 </sect3>
 
Index: server/mail/sendmail/sendmail-config.xml
===================================================================
--- server/mail/sendmail/sendmail-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ server/mail/sendmail/sendmail-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -70,5 +70,5 @@
 chmod 755 /etc/rc.d/init.d/sendmail</command></userinput></screen>
 
-<para>Create the run level symlinks with the following commands:
+<para>Create the run level symlinks with the following commands:</para>
 
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
@@ -79,6 +79,5 @@
 ln -sf ../init.d/sendmail ../rc4.d/S35sendmail &amp;&amp;
 ln -sf ../init.d/sendmail ../rc5.d/S35sendmail &amp;&amp;
-ln -sf ../init.d/sendmail ../rc6.d/K25sendmail</command></userinput></screen></para>
-</sect3>
+ln -sf ../init.d/sendmail ../rc6.d/K25sendmail</command></userinput></screen></sect3>
 
 </sect2>
Index: server/other/bind/bind-inst.xml
===================================================================
--- server/other/bind/bind-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ server/other/bind/bind-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>BIND</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 </sect2>
 
Index: server/other/cvsserver/cvsserver-inst.xml
===================================================================
--- server/other/cvsserver/cvsserver-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ server/other/cvsserver/cvsserver-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -95,7 +95,8 @@
 </para>
 
-<para><screen><userinput><command>cvs -d:pserver:anonymous@servername:/cvsroot co cvstest</command></userinput></screen>
+<screen><userinput><command>cvs
+-d:pserver:anonymous@<replaceable>servername</replaceable>:/cvsroot co cvstest</command></userinput></screen>
 <note><para>Replace "servername" with the <acronym>IP</acronym> address or 
-hostname of the <acronym>CVS</acronym> server</para></note></para>
+hostname of the <acronym>CVS</acronym> server</para></note>
 
 </sect2>
Index: x/lib/atk/atk-inst.xml
===================================================================
--- x/lib/atk/atk-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/atk/atk-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of <application>ATK</application></title>
+<title>Installation of <application><acronym>ATK</acronym></application></title>
 
-<para>Install <application>ATK</application> by running the following commands:</para>
+<para>Install <application><acronym>ATK</acronym></application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/lib/gtk/gtk+-inst.xml
===================================================================
--- x/lib/gtk/gtk+-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/gtk/gtk+-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of <application>GTK+</application></title>
+<title>Installation of <application><acronym>GTK</acronym>+</application></title>
 
-<para>Install <application>GTK+</application> by running the following commands:</para>
+<para>Install <application><acronym>GTK</acronym>+</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/lib/gtk/gtk+2-inst.xml
===================================================================
--- x/lib/gtk/gtk+2-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/gtk/gtk+2-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of <application>GTK+</application></title>
+<title>Installation of <application><acronym>GTK</acronym>+</application></title>
 
-<para>Install <application>GTK+</application> by running the following commands:</para>
+<para>Install <application><acronym>GTK</acronym>+</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/lib/lesstif/lesstif-inst.xml
===================================================================
--- x/lib/lesstif/lesstif-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/lesstif/lesstif-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,5 +4,5 @@
 <para>Install <application>LessTif</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr \
+<screen><userinput><command>./configure --prefix=/usr \
     --enable-build-20 \
     --enable-build-21 \
@@ -12,5 +12,5 @@
     --with-xdnd &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/lib/notification/startup-notification-inst.xml
===================================================================
--- x/lib/notification/startup-notification-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/notification/startup-notification-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -4,7 +4,7 @@
 <para>Install <application>startup-notification</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/lib/pango/pango-inst.xml
===================================================================
--- x/lib/pango/pango-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/pango/pango-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -10,7 +10,7 @@
 <para>Install <application>Pango</application> by running the following commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/lib/qt/qt-config.xml
===================================================================
--- x/lib/qt/qt-config.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/qt/qt-config.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>qt</application></title>
+<title>Configuring <application>Qt</application></title>
 
 <sect3><title>Configuration Information</title>
@@ -9,5 +9,5 @@
 shared libraries. The following command will add it if it is missing:</para>
 
-<para><screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</command>
 # Begin qt addition to /etc/ld.so.conf
 
@@ -16,11 +16,11 @@
 # End qt addition
 <command>EOF
-ldconfig</command></userinput></screen></para>
+ldconfig</command></userinput></screen>
 
-<para>You need to add the path for the <application>qt</application> man pages to the
+<para>You need to add the path for the <application>Qt</application> man pages to the
 <filename>man.conf</filename>
 file.  This can be done with the following command:</para>
 
-<para><screen><userinput><command>cat &gt;&gt; /etc/man.conf &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt;&gt; /etc/man.conf &lt;&lt; "EOF"</command>
 # Begin qt addition to man.conf
 
@@ -28,5 +28,5 @@
 
 # End qt addition to man.conf
-<command>EOF</command></userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 </sect3>
Index: x/lib/qt/qt-inst.xml
===================================================================
--- x/lib/qt/qt-inst.xml	(revision 009b52f5886b35f2978bfc465616c5452af377cc)
+++ x/lib/qt/qt-inst.xml	(revision a75063d4ec50acef7e2896fa6671fdb894bc3d32)
@@ -2,5 +2,5 @@
 <title>Installation of <application>qt</application></title>
 
-<para><screen><userinput><command>./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
+<screen><userinput><command>./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
 &nbsp;&nbsp;&nbsp;-system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
 &nbsp;&nbsp;&nbsp;-thread &amp;&amp;
@@ -10,5 +10,5 @@
 ln -s /opt/qt/lib/libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
 cp -r doc/man /opt/qt/doc &amp;&amp;
-cp -r examples /opt/qt/doc</command></userinput></screen></para>
+cp -r examples /opt/qt/doc</command></userinput></screen>
 
 <note><para>
