diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.sgml
index 6130925e28..e0e7ed614e 100644
--- a/en_US.ISO8859-1/articles/fonts/article.sgml
+++ b/en_US.ISO8859-1/articles/fonts/article.sgml
@@ -62,7 +62,8 @@
     <abstract>
       <para>This document contains a description of the various font
 	files that may be used with FreeBSD and the syscons driver,
-	X11, Ghostscript and Groff.  Cookbook examples are provided
+	<application>X11</application>, <application>Ghostscript</application>
+	and <application>Groff</application>.  Cookbook examples are provided
 	for switching the syscons display to 80x60 mode, and for using
 	type 1 fonts with the above application programs.</para>
     </abstract>
@@ -180,7 +181,7 @@
 	<listitem>
 	  <variablelist>
 	    <varlistentry>
-	      <term>Ghostscript</term>
+	      <term><application>Ghostscript</application></term>
 
 	      <listitem>
 		<para><filename>.pfa</filename>,
@@ -190,7 +191,7 @@
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>X11</term>
+	      <term><application>X11</application></term>
 
 	      <listitem>
 		<para><filename>.pfa</filename>,
@@ -199,7 +200,7 @@
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Groff</term>
+	      <term><application>Groff</application></term>
 
 	      <listitem>
 		<para><filename>.pfa</filename>,
@@ -208,7 +209,7 @@
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Povray</term>
+	      <term><application>Povray</application></term>
 
 	      <listitem>
 		<para><filename>.ttf</filename></para>
@@ -270,13 +271,13 @@
   </sect1>
 
   <sect1>
-    <title>Using type 1 fonts with X11</title>
+    <title>Using type 1 fonts with <application>X11</application></title>
 
-    <para>X11 can use either the <filename>.pfa</filename> or the
-      <filename>.pfb</filename> format fonts.  The X11 fonts are
+    <para><application>X11</application> can use either the <filename>.pfa</filename> or the
+      <filename>.pfb</filename> format fonts.  The <application>X11</application> fonts are
       located in various subdirectories under
       <filename>/usr/X11R6/lib/X11/fonts</filename>.  Each font file
-      is cross referenced to its X11 name by the contents of the
+      is cross referenced to its <application>X11</application> name by the contents of the
       <filename>fonts.dir</filename> file in each directory.</para>
 
     <para>There is already a directory named <filename>Type1</filename>.  The
@@ -302,8 +303,8 @@
 &prompt.user; <userinput>echo showboat - InfoMagic CICA, Dec 1994, /fonts/atm/showboat &gt;&gt;INDEX</userinput></screen>
     </informalexample>
 
-    <para>Now, to use a new font with X11, one must make the font file
-      available and update the font name files.  The X11 font names
+    <para>Now, to use a new font with <application>X11</application>, one must make the font file
+      available and update the font name files.  The <application>X11</application> font names
       look like:</para>
 
     <informalexample>
@@ -435,7 +436,7 @@ end readonly def
 
     <para>All of these names are arbitrary, but one should strive to
       be compatible with the existing conventions.  A font is
-      referenced by name with possible wild cards by an X11 program,
+      referenced by name with possible wild cards by an <application>X11</application> program,
       so the name chosen should make some sense.  One might begin by
       simply using
 
@@ -488,12 +489,12 @@ showboat.pfb -type1-showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1
   <sect1>
     <title>Using type 1 fonts with Ghostscript</title>
 
-    <para>Ghostscript references a font via its <filename>Fontmap</filename>
-      file.  This must be modified in a similar way to the X11
-      <filename>fonts.dir</filename> file.  Ghostscript can use either
+    <para><application>Ghostscript</application> references a font via its <filename>Fontmap</filename>
+      file.  This must be modified in a similar way to the <application>X11</application>
+      <filename>fonts.dir</filename> file. <application>Ghostscript</application> can use either
       the <filename>.pfa</filename> or the <filename>.pfb</filename>
       format fonts.  Using the font from the previous example, here is
-      how to use it with Ghostscript:</para>
+      how to use it with <application>Ghostscript</application>:</para>
 
     <informalexample>
       <screen><lineannotation>Put the font in Ghostscript's font directory</lineannotation>
@@ -526,22 +527,23 @@ GS&gt;<userinput>quit</userinput></screen>
     </informalexample>
 
     <para>References: <filename>fonts.txt</filename> in the
-      Ghostscript 4.01 distribution</para>
+      <application>Ghostscript 4.01</application> distribution</para>
   </sect1>
 
   <sect1>
     <title>Using type 1 fonts with Groff</title>
 
-    <para>Now that the new font can be used by both X11 and
-      Ghostscript, how can one use the new font with groff?  First of
+    <para>Now that the new font can be used by both <application>X11</application> and
+      <application>Ghostscript</application>, how can one use the new font 
+	with <application>groff</application>? First of
       all, since we are dealing with type 1 &postscript; fonts, the
-      groff device that is applicable is the <emphasis>ps</emphasis>
-      device.  A font file must be created for each font that groff
-      can use.  A groff font name is just a file in
+      <application>groff</application> device that is applicable is the <emphasis>ps</emphasis>
+      device.  A font file must be created for each font that <application>groff</application>
+      can use.  A <application>groff</application> font name is just a file in
       <filename>/usr/share/groff_font/devps</filename>.  With our
       example, the font file could be
       <filename>/usr/share/groff_font/devps/SHOWBOAT</filename>.  The
-      file must be created using tools provided by groff.</para>
+      file must be created using tools provided by <application>groff</application>.</para>
 
     <para>The first tool is <command>afmtodit</command>.  This is not
       normally installed, so it must be retrieved from the source
@@ -557,7 +559,7 @@ GS&gt;<userinput>quit</userinput></screen>
 :wq</userinput></screen>
     </informalexample>
 
-    <para>This tool will create the groff font file from the metrics
+    <para>This tool will create the <application>groff</application> font file from the metrics
       file (<filename>.afm</filename> suffix.) Continuing with our
       example:</para>
 
@@ -576,8 +578,8 @@ We need to convert them to &unix; style ^J delimited lines</lineannotation>
     <para>The font can now be referenced with the name
       SHOWBOAT.</para>
 
-    <para>If ghostscript is used to drive the printers on the system,
-      then nothing more needs to be done.  However, if true PostScript
+    <para>If <application>Ghostscript</application> is used to drive the printers on the system,
+      then nothing more needs to be done.  However, if true &postscript;
       printers are used, then the font must be down loaded to the
       printer in order for the font to be used (unless the printer
       happens to have the showboat font built in or on an accessible
@@ -701,7 +703,7 @@ EOF</userinput>
 	    upper case, so any renaming must be consistent with this.
 	    (Actually, <filename>GS_TTF.PS</filename> and
 	    <filename>PFS2AFM.PS</filename> are supposedly part of the
-	    ghostscript distribution, but it is just as easy to use
+	    <application>Ghostscript</application> distribution, but it is just as easy to use
 	    these as an isolated utility.  FreeBSD does not seem to
 	    include the latter.) You also may want to have these
 	    installed to
@@ -713,7 +715,7 @@ EOF</userinput>
 	<term><command>afmtodit</command></term>
 
 	<listitem>
-	  <para>Creates font files for use with groff from ascii font
+	  <para>Creates font files for use with <application>groff</application> from ascii font
 	    metrics file.  This usually resides in the directory,
 	    <filename>/usr/src/contrib/groff/afmtodit</filename>, and
 	    requires some work to get going.</para>
@@ -789,7 +791,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
       </listitem>
 
       <listitem>
-	<para>Create the groff PostScript file:</para>
+	<para>Create the <application>groff</application> PostScript file:</para>
 
 	<para>Change directories to
 	  <filename>/usr/share/groff_font/devps</filename> so as to
@@ -845,10 +847,11 @@ Converting 3of9.ttf to A.pfa and B.afm.
       fonts available in this format.</para>
 
     <para>Unfortunately, there are few applications that I am aware of
-      that can use this format: Ghostscript and Povray come to mind.
-      Ghostscript's support, according to the documentation, is
+      that can use this format: <application>Ghostscript</application> 
+	and <application>Povray</application> come to mind.
+      <application>Ghostscript's</application> support, according to the documentation, is
       rudimentary and the results are likely to be inferior to type 1
-      fonts.  Povray version 3 also has the ability to use TrueType
+      fonts. <application>Povray</application> version 3 also has the ability to use TrueType
       fonts, but I rather doubt many people will be creating documents
       as a series of raytraced pages :-).</para>
 
@@ -867,7 +870,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
       </listitem>
 
       <listitem>
-	<para>The <command>xfsft</command> font server for X11 can
+	<para>The <command>xfsft</command> font server for <application>X11</application> can
 	  serve TrueType fonts in addition to regular fonts.  Though
 	  currently in beta, it is said to be quite usable.  See
 	  <ulink
@@ -879,7 +882,8 @@ Converting 3of9.ttf to A.pfa and B.afm.
       </listitem>
 
       <listitem>
-	<para><command>xfstt</command> is another font server for X11,
+	<para><application>xfstt</application> is another font server for 
+		<application>X11</application>,
 	  available under <ulink url="
 	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts/"></ulink>.</para>
       </listitem>
@@ -961,7 +965,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
       </listitem>
 
       <listitem>
-	<para>How to generate the groff character mapping files for
+	<para>How to generate the <application>groff</application> character mapping files for
 	  PostScript fonts with non-standard character names?</para>
       </listitem>
 
@@ -972,7 +976,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
 
       <listitem>
 	<para>It would be good to have examples of using TrueType
-	  fonts with povray and ghostscript.</para>
+	  fonts with <application>Povray</application> and <application>Ghostscript</application>.</para>
       </listitem>
     </itemizedlist>
   </sect1>