Index: appendices/generic/generic.xml
===================================================================
--- appendices/generic/generic.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/generic/generic.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -4,5 +4,5 @@
 
 <para>When you want to install a package to a location other than
-<filename>/</filename>, or <filename>/usr</filename>, you are installing
+<filename class='directory'>/</filename>, or <filename class='directory'>/usr</filename>, you are installing
 outside the default envionment settings on most machines.  The following
 examples should assist you in determining how to correct this situation.
@@ -11,16 +11,20 @@
 
 <itemizedlist>
-<listitem><para>Expand the PATH to include
-$PREFIX/bin.</para></listitem>
-<listitem><para>Expand the PATH for root to include
-$PREFIX/sbin.</para></listitem>
-<listitem><para>Add $PREFIX/lib to /etc/ld.so.conf or expand
-LD_LIBRARY_PATH to include it.</para></listitem>
-<listitem><para>Add $PREFIX/man to /etc/man.conf or expand
-MANPATH.</para></listitem>
-<listitem><para>Add $PREFIX/info to INFOPATH.</para></listitem>
-<listitem><para>Add $PREFIX/lib/pkgconfig to
-PKG_CONFIG_PATH.</para></listitem>
-<listitem><para>Add $PREFIX/include to CPPFLAGS when compiling packages
+<listitem><para>Expand the <envar>PATH</envar> to include
+<filename class='directory'>$PREFIX/bin</filename>.</para></listitem>
+<listitem><para>Expand the <envar>PATH</envar> for root to include
+<filename class='directory'>$PREFIX/sbin</filename>.</para></listitem>
+<listitem><para>Add <filename class='directory'>$PREFIX/lib</filename>
+to <filename>/etc/ld.so.conf</filename> or expand
+<envar>LD_LIBRARY_PATH</envar> to include it.</para></listitem>
+<listitem><para>Add <filename class='directory'>$PREFIX/man</filename>
+to <filename>/etc/man.conf</filename> or expand <envar>MANPATH</envar>.</para></listitem>
+<listitem><para>Add <filename class='directory'>$PREFIX/info</filename>
+to <envar>INFOPATH</envar>.</para></listitem>
+<listitem><para>Add <filename
+class='directory'>$PREFIX/lib/pkgconfig</filename> to
+<envar>PKG_CONFIG_PATH</envar>.</para></listitem>
+<listitem><para>Add <filename
+class='directory'>$PREFIX/include</filename> to <envar>CPPFLAGS</envar> when compiling packages
 that depend on the package you installed.</para></listitem>
 </itemizedlist>
Index: appendices/symlinks/rc0.xml
===================================================================
--- appendices/symlinks/rc0.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc0.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -19,4 +19,18 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K00</entry>
+<entry>cups</entry>
+<entry><filename>../init.d/cups</filename></entry>
+<entry>Shut down Common Unix printing system: <xref linkend="cups"/></entry>
+</row>
+
+<row>
+<entry>K00</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Shut down LPR print spooler: <xref linkend="LPRng"/></entry>
 </row>
 
Index: appendices/symlinks/rc1.xml
===================================================================
--- appendices/symlinks/rc1.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc1.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K00</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Shut down LPR print spooler: <xref linkend="LPRng"/></entry>
 </row>
 
Index: appendices/symlinks/rc2.xml
===================================================================
--- appendices/symlinks/rc2.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc2.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -141,4 +141,19 @@
 </row>
 
+<row>
+<entry>S99</entry>
+<entry>cups</entry>
+<entry><filename>../init.d/cups</filename></entry>
+<entry>Start the Common Unix printing system: <xref
+linkend="cups"/></entry>
+</row>
+
+<row>
+<entry>S99</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Start the LPR print spooler: <xref linkend="LPRng"/></entry>
+</row>
+
 </tbody>
 </tgroup>
Index: appendices/symlinks/rc3.xml
===================================================================
--- appendices/symlinks/rc3.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc3.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -140,4 +140,19 @@
 </row>
 
+<row>
+<entry>S99</entry>
+<entry>cups</entry>
+<entry><filename>../init.d/cups</filename></entry>
+<entry>Start the Common Unix printing system: <xref
+linkend="cups"/></entry>
+</row>
+
+<row>
+<entry>S99</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Start the LPR print spooler: <xref linkend="LPRng"/></entry>
+</row>
+
 </tbody>
 </tgroup>
Index: appendices/symlinks/rc4.xml
===================================================================
--- appendices/symlinks/rc4.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc4.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -140,4 +140,12 @@
 </row>
 
+<row>
+<entry>S99</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Start the LPR print spooler: <xref linkend="LPRng"/></entry>
+</row>
+
+
 </tbody>
 </tgroup>
Index: appendices/symlinks/rc5.xml
===================================================================
--- appendices/symlinks/rc5.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc5.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -140,4 +140,20 @@
 </row>
 
+<row>
+<entry>S99</entry>
+<entry>cups</entry>
+<entry><filename>../init.d/cups</filename></entry>
+<entry>Start the Common Unix printing system: <xref
+linkend="cups"/></entry>
+</row>
+
+<row>
+<entry>S99</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Start the LPR print spooler: <xref linkend="LPRng"/></entry>
+</row>
+
+
 </tbody>
 </tgroup>
Index: appendices/symlinks/rc6.xml
===================================================================
--- appendices/symlinks/rc6.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ appendices/symlinks/rc6.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -19,4 +19,11 @@
 <entry><emphasis>Link</emphasis></entry>
 <entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K00</entry>
+<entry>lprng</entry>
+<entry><filename>../init.d/lprng</filename></entry>
+<entry>Shut down LPR print spooler: <xref linkend="LPRng"/></entry>
 </row>
 
Index: general/graphlib/libpng/libpng-desc.xml
===================================================================
--- general/graphlib/libpng/libpng-desc.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ general/graphlib/libpng/libpng-desc.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -2,6 +2,5 @@
 <title>Contents</title>
 
-<para>The libpng package contains <userinput>png
-libraries</userinput> and <userinput>libpng-config</userinput>.</para>
+<para>The libpng package contains <filename>libpng</filename> libraries and <userinput>libpng-config</userinput>.</para>
 
 </sect2>
Index: general/prog/gcc2/gcc2-config.xml
===================================================================
--- general/prog/gcc2/gcc2-config.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ general/prog/gcc2/gcc2-config.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -14,5 +14,6 @@
 
 <para>Whenever you need to use gcc-&gcc2-version; instead of you system installed compiler,
-add <userinput>/opt/gcc2/bin</userinput> to the front of your PATH before compiling the concerned
+add <userinput>/opt/gcc2/bin</userinput> to the front of your
+<envar>PATH</envar> before compiling the concerned
 package.</para>
 
Index: general/prog/jdk/j2sdk-exp.xml
===================================================================
--- general/prog/jdk/j2sdk-exp.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ general/prog/jdk/j2sdk-exp.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -6,5 +6,7 @@
 <para><userinput>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</userinput> : Patch to fix duplicate messages in the intl files.</para>
 <para><userinput>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</userinput> : Patch to add missing libs to fix unresolved symbols.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch</userinput> : The build wants the binaries in specific locations, this patch modifies this to use the current PATH environment to find binaries.</para>
+<para><userinput>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch</userinput> : The build wants
+the binaries in specific locations, this patch modifies this to use the
+current <envar>PATH</envar> environment to find binaries.</para>
 <para><userinput>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</userinput> : Patch to fix syntax for gcc3.</para>
 <para><userinput>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch</userinput> : Patch to rename the internal motif library to avoid conflicts with an incompatible system installed version.</para>
Index: gnome/add/media/gstreamer-desc.xml
===================================================================
--- gnome/add/media/gstreamer-desc.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ gnome/add/media/gstreamer-desc.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The gstreamer package contains <userinput>gstreamer libraries</userinput> and <userinput>gst-control libraries</userinput></para>
+<para>The gstreamer package contains <filename>libgstreamer</filename>
+libraries and <filename>libgst</filename> libraries.</para>
 
 </sect2>
Index: gnome/add/media/nautilus-media-desc.xml
===================================================================
--- gnome/add/media/nautilus-media-desc.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ gnome/add/media/nautilus-media-desc.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -3,6 +3,5 @@
 
 <para>The nautilus-media package contains
-<userinput>nautilus-audio-view</userinput> and
-<userinput>support libraries</userinput></para>
+<userinput>nautilus-audio-view</userinput> and support libraries.</para>
 
 </sect2>
Index: gnome/add/nautilus/nautilus-desc.xml
===================================================================
--- gnome/add/nautilus/nautilus-desc.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ gnome/add/nautilus/nautilus-desc.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -3,5 +3,5 @@
 
 <para>The nautilus package contains <userinput>nautilus</userinput> and
-<userinput>nautilus libraries</userinput>.</para>
+<filename>libnautilus</filename> libraries.</para>
 
 </sect2>
Index: gnome/gnome-intro.xml
===================================================================
--- gnome/gnome-intro.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ gnome/gnome-intro.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -14,5 +14,5 @@
 installed software, especially if you are testing Gnome on your machine.
 Gnome-&gnome-version; packages utilize the --prefix= option for configure, so we will
-use that and an Environment variable (GNOME_PREFIX) to add flexibility to 
+use that and an Environment variable (<envar>GNOME_PREFIX</envar>) to add flexibility to 
 the install.</para>
 
@@ -46,7 +46,8 @@
 from BLFS systems when it is no longer necessary.  These instructions
 may be refined later to comply with BLFS standards for file locations,
-specifically <filename>/opt/gnome/etc</filename> to
-<filename>/etc</filename> and <filename>/opt/gnome/var</filename> to
-<filename>/var</filename>.  You should consider using the Gnome 1.4 hint
+specifically <filename class='directory'>/opt/gnome/etc</filename> to
+<filename class='directory'>/etc</filename> and <filename
+class='directory'>/opt/gnome/var</filename> to
+<filename class='directory'>/var</filename>.  You should consider using the Gnome 1.4 hint
 located at <ulink url="http://hints.linuxfromscratch.org/hints"/> if you
 have no interest in Gnome-&gnome-version;.</para>
Index: gnome/lib/gnome-vfs/gnome-vfs1-desc.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs1-desc.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ gnome/lib/gnome-vfs/gnome-vfs1-desc.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnome-vfs package contains <userinput>libgnomevfs libraries</userinput>.</para>
+<para>The gnome-vfs package contains <filename>libgnomevfs</filename> libraries.</para>
 
 </sect2>
Index: pst/typesetting/tex/tex-exp.xml
===================================================================
--- pst/typesetting/tex/tex-exp.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ pst/typesetting/tex/tex-exp.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -3,5 +3,5 @@
 
 <para><screen><userinput>gzip -dc ../teTeX-texmf-&tex-version;.tar.gz \
-        | (umask 0; cd /usr/share/texmf; tar xvf -)</userinput></screen> Un-tar the TeX fonts and macro libraries.</para>
+        | (umask 0; cd /usr/share/texmf; tar xvf -)</userinput></screen> Untar the TeX fonts and macro libraries.</para>
 
 <para><userinput>--with-x=no</userinput> : Avoid any X-Windows dependencies.  TeX can be compiled with X-Windows support, notably for xdvi.  If this is desired, remove this
Index: x/installing/xfree86/xfree86-config.xml
===================================================================
--- x/installing/xfree86/xfree86-config.xml	(revision 1100e0d2770603e9cf0aa512772b1b20550cbc9f)
+++ x/installing/xfree86/xfree86-config.xml	(revision e68cc1cd792ed6507fe8a2fe4cf7f393b4a9329a)
@@ -6,5 +6,6 @@
 Run <screen><userinput>ldconfig</userinput></screen></para>
 
-<para>Add <filename>/usr/X11R6/bin</filename> to your PATH environment 
+<para>Add <filename class='directory'>/usr/X11R6/bin</filename> to your
+<envar>PATH</envar> environment 
 variable in <filename>.bash_profile</filename>.  The statement should
 look something like <userinput>PATH=$PATH:/usr/X11R6/bin</userinput>
