diff --git a/x/installing/libXau.xml b/x/installing/libXau.xml
index f77524f1b5..d09f179145 100644
--- a/x/installing/libXau.xml
+++ b/x/installing/libXau.xml
@@ -88,10 +88,14 @@ make</userinput></screen>
     <title>Contents</title>
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>libXau.{so,a}</seg>
+        <seg>None</seg>
+        <seg>libXau.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -101,11 +105,11 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libXau-x7">
-        <term><filename class='libraryfile'>libXau.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libXau.so</filename></term>
         <listitem>
           <para>is the library of X authority database routines.</para>
           <indexterm zone="libXau libXau-x7">
-            <primary sortas="c-libXau">libXau.{so,a}</primary>
+            <primary sortas="c-libXau">libXau.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/x/installing/libXdmcp.xml b/x/installing/libXdmcp.xml
index 52a5607726..38faf390ae 100644
--- a/x/installing/libXdmcp.xml
+++ b/x/installing/libXdmcp.xml
@@ -94,7 +94,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libXdmcp.{so,a}</seg>
+        <seg>libXdmcp.so</seg>
         <seg>None</seg>
       </seglistitem>
     </segmentedlist>
@@ -105,11 +105,11 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libXdmcp-x7">
-        <term><filename class='libraryfile'>libXdmcp.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libXdmcp.so</filename></term>
         <listitem>
           <para>is the X Display Manager Control Protocol library.</para>
           <indexterm zone="libXdmcp libXdmcp-x7">
-            <primary sortas="c-libXdmcp">libXdmcp.{so,a}</primary>
+            <primary sortas="c-libXdmcp">libXdmcp.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/x/installing/libXp.xml b/x/installing/libXp.xml
index 30568cac13..9aab309d77 100644
--- a/x/installing/libXp.xml
+++ b/x/installing/libXp.xml
@@ -89,10 +89,14 @@ make</userinput></screen>
     <title>Contents</title>
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>libXp.{so,a}</seg>
+        <seg>None</seg>
+        <seg>libXp.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -102,11 +106,11 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libXp-lib">
-        <term><filename class='libraryfile'>libXp.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libXp.so</filename></term>
         <listitem>
           <para>is the library of X authority database routines.</para>
           <indexterm zone="libXp libXp">
-            <primary sortas="c-libXp">libXp.{so,a}</primary>
+            <primary sortas="c-libXp">libXp.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/x/installing/mesalib.xml b/x/installing/mesalib.xml
index b334bfd15c..f405f1756a 100644
--- a/x/installing/mesalib.xml
+++ b/x/installing/mesalib.xml
@@ -407,7 +407,7 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="glxgears">
-        <term><filename>glxgears</filename></term>
+        <term><command>glxgears</command></term>
         <listitem>
           <para>
             is a GL demo useful for troubleshooting graphics
@@ -420,7 +420,7 @@ make</userinput></screen>
       </varlistentry>
 
       <varlistentry id="glxinfo">
-        <term><filename>glxinfo</filename></term>
+        <term><command>glxinfo</command></term>
         <listitem>
           <para>
             is a diagnostic program that displays information about the
diff --git a/x/installing/xterm.xml b/x/installing/xterm.xml
index e5722f5472..a4974b162f 100644
--- a/x/installing/xterm.xml
+++ b/x/installing/xterm.xml
@@ -151,9 +151,13 @@ EOF</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>koi8rxterm, resize, uxterm, and xterm</seg>
+        <seg>None</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -163,7 +167,7 @@ EOF</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="koi8rxterm">
-        <term><filename>koi8rxterm</filename></term>
+        <term><command>koi8rxterm</command></term>
         <listitem>
           <para>is a wrapper script to set up xterm with a KOI8-R locale.</para>
           <indexterm zone="xterm2 koi8rxterm">
@@ -175,7 +179,7 @@ EOF</userinput></screen>
 
 
       <varlistentry id="resize">
-        <term><filename>resize</filename></term>
+        <term><command>resize</command></term>
         <listitem>
           <para>prints a shell command for setting the TERM and TERMCAP
           environment  variables to indicate the current size of xterm
@@ -187,7 +191,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="uxterm">
-        <term><filename>uxterm</filename></term>
+        <term><command>uxterm</command></term>
         <listitem>
           <para>is a wrapper script that modifies the current locale to use UTF-8
           and starts xterm with the proper settings.</para>
@@ -198,7 +202,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="xterm-bin">
-        <term><filename>xterm</filename></term>
+        <term><command>xterm</command></term>
         <listitem>
           <para>is a terminal emulator for the X Window System.</para>
           <indexterm zone="xterm2 xterm2">