Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision 384039a34e5b72f3cfbeb88b8b0604784c33df27)
+++ gnome/add/at-spi.xml	(revision 3ba3f589fd3284a31983593d547a2d98c8c5e146)
@@ -83,5 +83,5 @@
     <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
 
-<screen><userinput role='root'>make install</userinput></screen>
+<screen role='root'><userinput>make install</userinput></screen>
 
   </sect2>
Index: introduction/important/unpacking.xml
===================================================================
--- introduction/important/unpacking.xml	(revision 384039a34e5b72f3cfbeb88b8b0604784c33df27)
+++ introduction/important/unpacking.xml	(revision 3ba3f589fd3284a31983593d547a2d98c8c5e146)
@@ -16,12 +16,12 @@
   <title>Notes on Building Software</title>
 
-  <para>Those people who have built an LFS system will be aware 
+  <para>Those people who have built an LFS system will be aware
   of the general principles of downloading and unpacking software.  We will
   however repeat some of that information here for those new to building
   their own software.</para>
 
-  <para>Each set of installation instructions contains a URL from which you 
-  can download the package.  We do however keep a selection of patches 
-  available via http.  These are referenced as needed in the installation 
+  <para>Each set of installation instructions contains a URL from which you
+  can download the package.  We do however keep a selection of patches
+  available via http.  These are referenced as needed in the installation
   instructions.</para>
 
@@ -43,21 +43,21 @@
     the following commands:</para>
 
-<screen><command>tar -xvf filename.tar.gz
+<screen><userinput>tar -xvf filename.tar.gz
 tar -xvf filename.tgz
 tar -xvf filename.tar.Z
-tar -xvf filename.tar.bz2</command></screen>
+tar -xvf filename.tar.bz2</userinput></screen>
 
     <para>You can also use a slightly different method:</para>
 
-<screen><command>bzcat filename.tar.bz2 | tar -xv</command></screen>
+<screen><userinput>bzcat filename.tar.bz2 | tar -xv</userinput></screen>
 
     <para>Finally, you sometimes need to be able to unpack patches which are
     generally not tar'ed.  The best way to do this is to copy the patch file to
     <filename>/usr/src</filename> and then to run one of the following commands
-    depending on whether the file is <filename>.gz</filename> or 
+    depending on whether the file is <filename>.gz</filename> or
     <filename>.bz2</filename>:</para>
 
-<screen><command>gunzip -v patchname.gz
-bunzip2 -v patchname.bz2</command></screen>
+<screen><userinput>gunzip -v patchname.gz
+bunzip2 -v patchname.bz2</userinput></screen>
 
   </sect2>
@@ -73,5 +73,5 @@
     run the following command:</para>
 
-<screen><command>md5sum -c file.md5sum</command></screen>
+<screen><userinput>md5sum -c file.md5sum</userinput></screen>
 
     <para>If there are any errors, they will be reported.</para>
@@ -88,12 +88,12 @@
     command you intend to execute.</para>
 
-<screen><command>( &lt;command&gt; 2&gt;&amp;1 | tee compile.log &amp;&amp; exit $PIPESTATUS )</command></screen>
+<screen><userinput>( &lt;command&gt; 2&gt;&amp;1 | tee compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
 
-    <para><option>2&gt;&amp;1</option> redirects error messages to the same 
-    location as standard output. The <command>tee</command> command allows 
+    <para><option>2&gt;&amp;1</option> redirects error messages to the same
+    location as standard output. The <command>tee</command> command allows
     viewing of the output while logging the results to a file. The parentheses
     around the command run the entire command in a subshell and finally the
-    <command>exit $PIPESTATUS</command> ensures the result of the 
-    &lt;command&gt; is returned as the result and not the result of the 
+    <command>exit $PIPESTATUS</command> ensures the result of the
+    &lt;command&gt; is returned as the result and not the result of the
     <command>tee</command> command.</para>
 
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 384039a34e5b72f3cfbeb88b8b0604784c33df27)
+++ kde/add/kdemultimedia.xml	(revision 3ba3f589fd3284a31983593d547a2d98c8c5e146)
@@ -58,11 +58,11 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>, 
-    <xref linkend="libxml2"/>, 
-    <xref linkend="alsa"/>, and 
+    <para><xref linkend="libjpeg"/>,
+    <xref linkend="libxml2"/>,
+    <xref linkend="alsa"/>, and
     <xref linkend="libmad"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="cdparanoia"/>, 
+    <para><xref linkend="cdparanoia"/>,
     <xref linkend="lame"/>,
     <xref linkend="audiofile"/>,
@@ -71,11 +71,11 @@
     <xref linkend="xine-lib"/>,
     <xref linkend="flac"/>,
-    <xref linkend="speex"/>, 
-    <xref linkend="sdl"/>, 
-    <xref linkend="gstreamer"/> 
-    (with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>), 
-    <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>, 
-    <ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>, 
-    <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM Generator</ulink>, and 
+    <xref linkend="speex"/>,
+    <xref linkend="sdl"/>,
+    <xref linkend="gstreamer"/>
+    (with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>),
+    <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>,
+    <ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>,
+    <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM Generator</ulink>, and
     <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink></para>
 
@@ -87,15 +87,15 @@
     <para>Install <application>kdemultimedia</application> with:</para>
 
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
- 
+
   </sect2>
 
-<!-- 
+<!--
 <sect2>
   <title>Configuring kdemultimedia</title>
@@ -120,5 +120,5 @@
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
-     
+
       <seglistitem>
         <seg>artsbuilder, juk, kaboodle, kmid, kmix, krec, kscd, and noatun</seg>
@@ -127,5 +127,5 @@
       </seglistitem>
     </segmentedlist>
-     
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -136,5 +136,5 @@
         <term><command>artsbuilder</command></term>
         <listitem>
-          <para>is a tool to create new structures of small connected 
+          <para>is a tool to create new structures of small connected
           <application>aRts</application> modules.</para>
           <indexterm zone="kdemultimedia artsbuilder">
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision 384039a34e5b72f3cfbeb88b8b0604784c33df27)
+++ xsoft/graphweb/mozilla.xml	(revision 3ba3f589fd3284a31983593d547a2d98c8c5e146)
@@ -241,7 +241,7 @@
     environment:</para>
 
-<screen><userinput><command>unset MOZILLA_OFFICIAL &amp;&amp;
+<screen><userinput>unset MOZILLA_OFFICIAL &amp;&amp;
 unset BUILD_OFFICIAL &amp;&amp;
-unset MOZ_CO_PROJECT</command></userinput></screen>
+unset MOZ_CO_PROJECT</userinput></screen>
 
   </sect2>
