Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ appendices/glossary.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -72,5 +72,5 @@
 
 <glossentry id="gCUPS"><glossterm><acronym>CUPS</acronym></glossterm>
-<glossdef><para>Common UNIX Printing System</para></glossdef></glossentry>
+<glossdef><para>Common Unix Printing System</para></glossdef></glossentry>
 
 <glossentry id="gCVS"><glossterm><acronym>CVS</acronym></glossterm>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -89,5 +89,5 @@
 <sect3><title>addcr</title>
 <para><command>addcr</command> adds carriage returns to files. This and
-<command>delcr</command> are useful for converting between Windows to UNIX file 
+<command>delcr</command> are useful for converting between Windows to Unix file 
 formats.</para></sect3>
 
Index: basicnet/mailnews/nail/nail-desc.xml
===================================================================
--- basicnet/mailnews/nail/nail-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ basicnet/mailnews/nail/nail-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -3,5 +3,5 @@
 <para>The <application>Nail</application> package contains <command>nail
 </command>, a program compatible with <command>mail</command> found on 
-commercial UNIX versions.</para>
+commercial Unix versions.</para>
 </sect2>
 
Index: basicnet/mailnews/nail/nail-intro.xml
===================================================================
--- basicnet/mailnews/nail/nail-intro.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ basicnet/mailnews/nail/nail-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -4,5 +4,5 @@
 <para>The <application>Nail</application> package contains a
 command-line Mail User Agent that is compatible with the <command>mail
-</command> command available in commercial UNIX versions. The <command>
+</command> command available in commercial Unix versions. The <command>
 mail</command> command is useful for writing scripts.</para>
 
Index: gnome/lib/linc/linc-desc.xml
===================================================================
--- gnome/lib/linc/linc-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ gnome/lib/linc/linc-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>linc</application> package contains <filename>liblinc</filename> libraries.</para>
+<para>The <application>linc</application> package contains <filename
+class="directory">liblinc</filename> libraries.</para>
 
 </sect2>
@@ -11,5 +12,5 @@
 <para>liblinc libraries provide the functions to take care of connection
 initiation and maintenance, and the details of various transports
-(<acronym>IP</acronym>v4, UNIX domain sockets,
+(<acronym>IP</acronym>v4, Unix domain sockets,
 <acronym>IP</acronym>v6 and <acronym>IrDA</acronym>).</para></sect3>
 
Index: multimedia/audioutils/cdparanoia/cdparanoia-desc.xml
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/cdparanoia/cdparanoia-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -4,5 +4,5 @@
 <para>The <application>CDParanoia</application> package contains
 <command>cdparanoia</command>
-and the <filename>libcdda</filename> libraries.</para>
+and the <filename class="libraryfile">libcdda</filename> libraries.</para>
 
 </sect2>
Index: multimedia/audioutils/lame/lame-desc.xml
===================================================================
--- multimedia/audioutils/lame/lame-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/lame/lame-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -3,5 +3,5 @@
 
 <para>The <application><acronym>LAME</acronym></application> package contains 
-<command>lame</command> and <filename>libmp3lame</filename> libraries.</para>
+<command>lame</command> and <filename class="libraryfile">libmp3lame</filename> libraries.</para>
 
 </sect2>
@@ -14,5 +14,5 @@
 
 <sect3><title>libmp3lame libraries</title>
-<para><filename>libmp3lame</filename> libraries provide the functions necessary 
+<para><filename class="libraryfile">libmp3lame</filename> libraries provide the functions necessary 
 to convert <filename>WAV</filename> files to <filename>MP3</filename> files.</para>
 </sect3>
Index: multimedia/audioutils/lame/lame-exp.xml
===================================================================
--- multimedia/audioutils/lame/lame-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/lame/lame-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--with-gtk-prefix=/usr</command> : This switch
+<para><parameter>--with-gtk-prefix=/usr</parameter>: This switch
 directs configure to <filename>gtk-config</filename>.</para>
 
Index: multimedia/audioutils/mpg123/mpg123-desc.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/mpg123/mpg123-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -10,5 +10,6 @@
 
 <sect3><title>mpg123</title>
-<para><command>mpg123</command> is used for playing mp3 files via the console.
+<para><command>mpg123</command> is used for playing
+<filename>MP3</filename> files via the console.
 </para></sect3>
 
Index: multimedia/audioutils/mpg123/mpg123-intro.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-intro.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/mpg123/mpg123-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -4,5 +4,5 @@
 <para>The <application>mpg123</application> package contains a console-based 
 <filename>MP3</filename> player. It claims to be the fastest <filename>MP3
-</filename> decoder for UNIX.</para>
+</filename> decoder for Unix.</para>
 
 <sect3><title>Package information</title>
Index: multimedia/audioutils/vorbistools.xml
===================================================================
--- multimedia/audioutils/vorbistools.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/vorbistools.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -1,5 +1,5 @@
-<sect1 id="vorbistools" xreflabel="Vorbis-Tools-&vorbistools-version;">
+<sect1 id="vorbistools" xreflabel="Vorbis Tools-&vorbistools-version;">
 <?dbhtml filename="vorbistools.html" dir="multimedia"?>
-<title>Vorbis-Tools-&vorbistools-version;</title>
+<title>Vorbis Tools-&vorbistools-version;</title>
 
 &vorbistools-intro;
Index: multimedia/audioutils/vorbistools/vorbistools-desc.xml
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/vorbistools/vorbistools-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>Vorbis-Tools</application> package contains
+<para>The <application>Vorbis Tools</application> package contains
 <command>oggdec</command>,
 <command>oggenc</command>,
Index: multimedia/audioutils/vorbistools/vorbistools-inst.xml
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools-inst.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/vorbistools/vorbistools-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>Vorbis-Tools</application></title>
+<title>Installation of <application>Vorbis Tools</application></title>
 
-<para>Install <application>Vorbis-Tools</application> by running the following 
+<para>Install <application>Vorbis Tools</application> by running the following 
 commands:</para>
 
Index: multimedia/audioutils/vorbistools/vorbistools-intro.xml
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools-intro.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/vorbistools/vorbistools-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>Vorbis-Tools</application></title>
+<title>Introduction to <application>Vorbis Tools</application></title>
 
-<para>The <application>Vorbis-Tools</application> package contains command line 
+<para>The <application>Vorbis Tools</application> package contains command line 
 tools for <filename>OGG</filename> audio files.  This is useful for encoding, 
 playing or editing files using the Ogg <acronym>CODEC</acronym>.</para>
@@ -19,5 +19,5 @@
 </sect3>
                                                                                 
-<sect3><title><application>Vorbis-Tools</application> dependencies</title>
+<sect3><title><application>Vorbis Tools</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="curl"/>, <xref linkend="libao"/>, <xref
Index: multimedia/audioutils/xmms/xmms-desc.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/xmms/xmms-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -10,8 +10,8 @@
 <sect3><title>xmms</title>
 <para><acronym>XMMS</acronym>, which stands for X MultiMedia System, is a 
-program comparable in function with WinAMP. It's main function is playing audio 
+program comparable in function with <application>WinAMP</application>. It's main function is playing audio 
 files like <filename>WAV</filename> and <filename>MP3</filename>. It can be 
 extended with plugins to play a number of 
-other audio or video formats. It's look can be customized with WinAMP style 
+other audio or video formats. It's look can be customized with <application>WinAMP</application> style 
 skins.</para></sect3>
 
@@ -21,10 +21,11 @@
 
 <sect3><title>gnomexmms</title>
-<para>This is an applet for the GNOME desktop environment that will dock into
-the GNOME panel. From the applet you can start and control
+<para>This is an applet for the <application><acronym>GNOME</acronym></application> desktop environment that will dock into
+the <application><acronym>GNOME</acronym></application> panel. From the applet you can start and control
 <command>xmms</command>.</para></sect3>
 
 <sect3><title>wmxmms</title>
-<para>wmxmms is a dock applet for the Window Maker window manager. From the 
-applet you ca start and control <command>xmms</command>.</para></sect3>
+<para>wmxmms is a dock applet for the <application>Window
+Maker</application> window manager. From the 
+applet you can start and control <command>xmms</command>.</para></sect3>
 </sect2>
Index: multimedia/audioutils/xmms/xmms-exp.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/audioutils/xmms/xmms-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><command>./configure --prefix=/usr --enable-one-plugin-dir
-</command> : This command ensures that all plugins are located under
-<filename>/usr/lib/xmms/Plugins</filename>.</para>
+<para><command>./configure --prefix=/usr --enable-one-plugin-dir</command>: 
+This command ensures that all plugins are located under
+<filename class="directory">/usr/lib/xmms/Plugins</filename>.</para>
 </sect2>
 
Index: multimedia/videoutils/avifile/avifile-exp.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/videoutils/avifile/avifile-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,6 +2,6 @@
 <title>Command explanations</title>
 
-<para><command> ./autogen.sh &amp;&amp; ./configure &amp;&amp;
-make maintainer-clean &amp;&amp; ./autogen.sh </command> : The 
+<para><command>./autogen.sh &amp;&amp; ./configure &amp;&amp;
+make maintainer-clean &amp;&amp; ./autogen.sh</command>: The 
 author of this package used the old autoconf which leads to
 problems like configure not being able to detect some libraries and compilation
Index: multimedia/videoutils/ffmpeg/ffmpeg-exp.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/videoutils/ffmpeg/ffmpeg-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--enable-shared</command> : This switch is needed to
+<para><option>--enable-shared</option>: This switch is needed to
 build <filename class="libraryfile">libavcodec</filename> and <filename
 class="libraryfile">libavformat</filename> shared libraries.</para>
Index: multimedia/videoutils/mplayer/mplayer-config.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-config.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/videoutils/mplayer/mplayer-config.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -31,5 +31,5 @@
 in <acronym>GUI</acronym> mode or not, leave that line out and start
 <command>mplayer</command> with
-<userinput>-gui</userinput> or as <command>gmplayer</command> (e.g.
+<option>-gui</option> or as <command>gmplayer</command> (e.g.
 when starting from a Window Manager menu or command prompt).</para>
 
Index: multimedia/videoutils/mplayer/mplayer-exp.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/videoutils/mplayer/mplayer-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,18 +2,18 @@
 <title>Command explanations</title>
 
-<para><command>--enable-gui</command> : This switch tells
+<para><option>--enable-gui</option>: This switch tells
 <application>MPlayer</application> to compile the <acronym>GUI</acronym> code.</para>
 
-<para><command>--enable-menu</command> :  These
+<para><option>--enable-menu</option>:  These
 switches enable the new menu support.  It's like an
 <acronym>OSD</acronym>, but you can
 also run a shell with it.</para>
 
-<para><command>--enable-shared-pp</command>  : This enables the
+<para><option>--enable-shared-pp</option>: This enables the
 building of a shared <filename
 class="libraryfile">libpostproc</filename> (library for post processing, featuring
 filters like sharpen).</para>
 
-<para><command>cp etc/codecs.conf /etc/mplayer</command> : This
+<para><command>cp etc/codecs.conf /etc/mplayer</command>: This
 command copies the standard <filename>codecs.conf</filename> file to the system-wide configuration directory.
 <application>MPlayer</application> expects this file at startup.</para>
Index: multimedia/videoutils/transcode/transcode-exp.xml
===================================================================
--- multimedia/videoutils/transcode/transcode-exp.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ multimedia/videoutils/transcode/transcode-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/usr</userinput> : This switch tells
+<para><parameter>--prefix=/usr</parameter>: This switch tells
 <application>transcode</application>
 where to install binaries, libraries and other files.</para>
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ postlfs/config/bootdisk.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -383,5 +383,5 @@
 <para>Install <application><ulink
 url="http://www.busybox.net/downloads/busybox-0.60.4.tar.bz2">busybox</ulink></application>
-into the initial ramdisk image.  Busybox incorporates many UNIX utility
+into the initial ramdisk image.  Busybox incorporates many Unix utility
 program functions into a single small executable file.</para>
 
Index: postlfs/shells/shells.xml
===================================================================
--- postlfs/shells/shells.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ postlfs/shells/shells.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -5,5 +5,5 @@
 <para>We are all familiar with the Bourne Again SHell, but there are two
 other user interfaces that are considered useful modern shells -- the
-Berkeley UNIX C shell and the Korn shell.  This chapter installs
+Berkeley Unix C shell and the Korn shell.  This chapter installs
 packages compatible with these additional shell types.</para>
 
Index: postlfs/shells/tcsh/tcsh-desc.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ postlfs/shells/tcsh/tcsh-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -11,5 +11,5 @@
 <sect3><title>tcsh</title>
 <para><command>tcsh</command> is an enhanced but completely compatible version of the
-Berkeley UNIX C shell, csh.  It is usable as both an interactive shell
+Berkeley Unix C shell, csh.  It is usable as both an interactive shell
 and a script processor.</para></sect3>
 
Index: postlfs/shells/tcsh/tcsh-intro.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-intro.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ postlfs/shells/tcsh/tcsh-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -3,5 +3,5 @@
 
 <para>The <application>Tcsh</application> package contains "an enhanced but completely compatible
-version of the Berkeley UNIX C shell (csh)".  This is useful as an
+version of the Berkeley Unix C shell (csh)".  This is useful as an
 alternative shell for those who prefer C syntax to that of the bash
 shell, and also because some programs require the C shell in order to
Index: pst/printing/cups/cups-desc.xml
===================================================================
--- pst/printing/cups/cups-desc.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ pst/printing/cups/cups-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -33,5 +33,5 @@
 
 <sect3><title>cupsd</title>
-<para><command>cupsd</command> is the scheduler for the Common UNIX Printing System.
+<para><command>cupsd</command> is the scheduler for the Common Unix Printing System.
 </para></sect3>
 
Index: pst/printing/cups/cups-intro.xml
===================================================================
--- pst/printing/cups/cups-intro.xml	(revision 8604d92fe917953b5914e27de66769a9eb02c98c)
+++ pst/printing/cups/cups-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
@@ -3,5 +3,5 @@
 <application><acronym>CUPS</acronym></application></title>
 
-<para>The Common UNIX Printing System (<acronym>CUPS</acronym>) is a print spooler and 
+<para>The Common Unix Printing System (<acronym>CUPS</acronym>) is a print spooler and 
 associated utilities. It is based on the "Internet Printing Protocol" 
 and provides printing services to most PostScript and 
