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>
