Remove redundant markup and words except in two instances where

the removal would put the marked up section at the beginning of
the sentence, which we try to avoid. These need to be dealed with
separately by rephrasing the sentence.

Obtained from:	    Jenkins checkstyle igor(8) warnings

en_US.ISO8859-1/books/handbook/x11/chapter.xml

@@ -600,7 +600,7 @@ dbus_enable="YES"</programlisting>
 	<filename>~/.xsession</filename> when logging in through a
 	graphical login manager like <application>XDM</application>).
 	A third way is to use the new
-	<filename>/usr/local/etc/fonts/local.conf</filename> file as
+	<filename>/usr/local/etc/fonts/local.conf</filename> as
 	demonstrated in <xref linkend="antialias"/>.</para>
     </sect2>
 
@@ -621,8 +621,7 @@ dbus_enable="YES"</programlisting>
 	used in this example because it is more consistent with the
 	other font rendering back-ends.  To enable the freetype module
 	just add the following line to the <literal>"Module"</literal>
-	section of the <filename>/etc/X11/xorg.conf</filename>
-	file.</para>
+	section of <filename>/etc/X11/xorg.conf</filename>.</para>
 
       <programlisting>Load  "freetype"</programlisting>
 
@@ -635,7 +634,7 @@ dbus_enable="YES"</programlisting>
 	format for use by <application>&xorg;</application>.  Once the
 	files have been copied into this directory, use
 	<application>ttmkfdir</application> to create a
-	<filename>fonts.dir</filename> file, so that the X font
+	<filename>fonts.dir</filename>, so that the X font
 	renderer knows that these new files have been installed.
 	<command>ttmkfdir</command> is available from the FreeBSD
 	Ports Collection as
@@ -651,8 +650,8 @@ dbus_enable="YES"</programlisting>
       <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
-      <para>or add a <literal>FontPath</literal> line to the
-	<filename>xorg.conf</filename> file.</para>
+      <para>or add a <literal>FontPath</literal> line to
+	<filename>xorg.conf</filename>.</para>
 
       <para>That's it.  Now <application>Gimp</application>,
 	<application>Apache OpenOffice</application>, and all of the
@@ -829,8 +828,8 @@ dbus_enable="YES"</programlisting>
 	be desired.  This basically treats the (horizontally
 	separated) red, green and blue components separately to
 	improve the horizontal resolution; the results can be
-	dramatic.  To enable this, add the line somewhere in the
-	<filename>local.conf</filename> file:</para>
+	dramatic.  To enable this, add the line somewhere in
+	<filename>local.conf</filename>:</para>
 
       <programlisting>&lt;match target="font"&gt;
 	     &lt;test qual="all" name="rgba"&gt;
@@ -983,7 +982,7 @@ dbus_enable="YES"</programlisting>
 		If a display that <application>XDM</application> is
 		trying to start hangs, look at this file for error
 		messages.  These messages are also written to the
-		user's <filename>~/.xsession-errors</filename> file on
+		user's <filename>~/.xsession-errors</filename> on
 		a per-session basis.</entry>
 	    </row>
 
@@ -1076,7 +1075,7 @@ DisplayManager.requestPort:     0</screen>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>For proper operation, <application>GNOME</application>
-	requires the <filename>/proc</filename> file system to be
+	requires <filename>/proc</filename> to be
 	mounted.  Add this line to <filename>/etc/fstab</filename> to
 	mount this file system automatically during system
 	startup:</para>
@@ -1159,8 +1158,8 @@ DisplayManager.requestPort:     0</screen>
 	<secondary>display manager</secondary>
       </indexterm>
 
-      <para><application>KDE</application> requires the
-	<filename>/proc</filename> file system to be mounted.  Add
+      <para><application>KDE</application> requires
+	<filename>/proc</filename> to be mounted.  Add
 	this line to <filename>/etc/fstab</filename> to mount this
 	file system automatically during system startup:</para>