Index: plist/chapter.xml
===================================================================
--- plist/chapter.xml
+++ plist/chapter.xml
@@ -429,8 +429,8 @@
          the unpacking process.  If command contains any of these
          sequences somewhere in it, they are expanded
          inline.  For these examples, assume that
-         <literal>@cwd</literal> is set to <filename
-           >/usr/local</filename> and the last
+         <literal>@cwd</literal> is set to
+         <filename>/usr/local</filename> and the last
          extracted file was <filename>bin/emacs</filename>.</para>
 
        <variablelist>
@@ -449,8 +449,7 @@
            <listitem>
              <para>Expand to the current directory prefix, as set
                with <literal>@cwd</literal>.  In the example case
-               <filename
-                 >/usr/local</filename>.</para>
+               <filename>/usr/local</filename>.</para>
            </listitem>
          </varlistentry>
 
@@ -461,8 +460,8 @@
              <para>Expand to the basename of the fully qualified
                filename, that is, the current directory prefix plus
                the last filespec, minus the trailing filename.  In
-               the example case, that would be <filename
-                 >/usr/local/bin</filename>.</para>
+               the example case, that would be
+               <filename>/usr/local/bin</filename>.</para>
            </listitem>
          </varlistentry>
 
@@ -582,9 +581,8 @@
       <title>Creating New Keywords</title>
 
       <para>Package list files can be extended by keywords that are
-       defined in the <filename
-         >${PORTSDIR}/Keywords</filename> directory.
-       The settings for each keyword are stored in a
+       defined in the <filename>${PORTSDIR}/Keywords</filename>
+       directory.  The settings for each keyword are stored in a
        <acronym>UCL</acronym> file named
        <filename><replaceable>keyword</replaceable>.ucl</filename>.
        The file must contain at least one of the next
Index: uses/chapter.xml
===================================================================
--- uses/chapter.xml
+++ uses/chapter.xml
@@ -672,15 +672,11 @@
                  by default, add it to <varname>PLIST_SUB</varname>
                  and <varname>MAKE_ENV</varname>, and create it upon
                  installation.  If <varname>KMODDIR</varname> is set
-                 to
-                 <filename>/boot/kernel</filename>,
-                 it will be rewritten to <filename
-                   >/boot/modules</filename>.  This
+                 to <filename>/boot/kernel</filename>, it will be
+                 rewritten to <filename>/boot/modules</filename>.  This
                  prevents breaking packages when upgrading the kernel
-                 due to <filename
-                   >/boot/kernel</filename> being
-                 renamed to <filename
-                   >/boot/kernel.old</filename> in
+                 due to <filename>/boot/kernel</filename> being
+                 renamed to <filename>/boot/kernel.old</filename> in
                  the process.</para>
              </listitem>
 
@@ -1287,8 +1283,8 @@
 
              <listitem>
                <para><varname>WEBPLUGIN_DIR</varname>: The directory
-                 to install the plug-in files to, default <filename
-                   ><replaceable>PREFIX</replaceable>/lib/browser_plugins/<replaceable>WEBPLUGIN_NAME</replaceable></filename>.
+                 to install the plug-in files to, default
+                 <filename><replaceable>PREFIX</replaceable>/lib/browser_plugins/<replaceable>WEBPLUGIN_NAME</replaceable></filename>.
                  Set this if the port installs plug-in files outside
                  of the default directory to prevent broken symbolic
                  links.</para>