Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 04c940c34fb00b1a8d30a864bb7283ff4753a90d)
+++ x/installing/mesalib.xml	(revision c23b62bc4f435c75ed829b6b0e9c46c066821f5e)
@@ -65,10 +65,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="xorg7-lib"/>, 
+    <para role="required"><xref linkend="xorg7-lib"/>,
     <xref linkend="xorg7-util"/>, and
     <xref linkend="libdrm"/></para>
 
     <note>
-      <para>It is not recomended to build a newer version of 
+      <para>It is not recomended to build a newer version of
       <application>Mesa</application> with <xref linkend="xfree86"/> or
       <xref linkend="xorg"/>.</para>
@@ -102,6 +102,6 @@
 
     <para>You will need to adjust the commands below to reflect the
-    installation prefix of the X Window System.  First, correct several 
-    hard coded directories in the source files with the following 
+    installation prefix of the X Window System.  First, correct several
+    hard coded directories in the source files with the following
     commands:</para>
 
@@ -118,10 +118,10 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user,
-    issue the following commands to install 
+    issue the following commands to install
     <application>MesaLib</application>:</para>
 
 <screen role="root"><userinput>bin/installmesa $XORG_PREFIX</userinput></screen>
 
-    <para>While still the root user, install the modules for 
+    <para>While still the root user, install the modules for
     Xorg-&xorg7-version; with the following commands.</para>
 
@@ -142,5 +142,5 @@
 
     <note>
-      <para>Do not remove the Mesa source tree yet, it will be required to 
+      <para>Do not remove the Mesa source tree yet, it will be required to
       build the <xref linkend="xorg7-server"/>.</para>
     </note>
@@ -159,6 +159,6 @@
     <title>Command Explanations</title>
 
-    <para><command>find...sed -i 
-    "s@/usr/X11R6@$XORG_PREFIX@"...</command>: 
+    <para><command>find...sed -i
+    "s@/usr/X11R6@$XORG_PREFIX@"...</command>:
     This command corrects several hard coded references to the X11R6 default
     installation path.</para>
@@ -173,5 +173,5 @@
 
     <para><command>install -v -m755 lib/*dri*
-    $XORG_PREFIX/lib/X11/modules/dri</command>: 
+    $XORG_PREFIX/lib/X11/modules/dri</command>:
     installs the DRI modules.</para>
 
@@ -182,5 +182,5 @@
     the glxinfo and glxgears programs.</para>
 
-    <para><command>install -v -m755 glxinfo glxgears 
+    <para><command>install -v -m755 glxinfo glxgears
     $XORG_PREFIX/bin</command>:
     Installs only the glxinfo and glxgears programs.</para>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 04c940c34fb00b1a8d30a864bb7283ff4753a90d)
+++ x/installing/x7app.xml	(revision c23b62bc4f435c75ed829b6b0e9c46c066821f5e)
@@ -69,5 +69,5 @@
 
   <bridgehead renderas="sect4">Recommended</bridgehead>
-  <para><xref linkend="mesalib"/></para>
+  <para role="recommended"><xref linkend="mesalib"/></para>
 
   <para condition="html" role="usernotes">User Notes:
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 04c940c34fb00b1a8d30a864bb7283ff4753a90d)
+++ x/installing/x7driver.xml	(revision c23b62bc4f435c75ed829b6b0e9c46c066821f5e)
@@ -68,5 +68,5 @@
 
   <bridgehead renderas="sect4">Optional</bridgehead>
-  <para><xref linkend="mesalib"/></para>
+  <para role="optional"><xref linkend="mesalib"/></para>
 
   <para condition="html" role="usernotes">User Notes:
Index: x/installing/x7server.xml
===================================================================
--- x/installing/x7server.xml	(revision 04c940c34fb00b1a8d30a864bb7283ff4753a90d)
+++ x/installing/x7server.xml	(revision c23b62bc4f435c75ed829b6b0e9c46c066821f5e)
@@ -69,5 +69,5 @@
 
   <bridgehead renderas="sect4">Optional</bridgehead>
-  <para><xref linkend="mesalib"/> and
+  <para role="optional"><xref linkend="mesalib"/> and
   <xref linkend="luit"/></para>
 
@@ -86,11 +86,11 @@
 
 <!-- To be removed if/when proposed glibc patch is added to LFS SVN
-     Leave in in for a couple of weeks with 'you may need' and a testcase 
+     Leave in in for a couple of weeks with 'you may need' and a testcase
      around it to save the support list silly questions.  Should remove in
-     a couple of weeks 
+     a couple of weeks
       <para>Recent <application>Glibc</application> may have a problem with its
-      installed <filename>sys/kd.h</filename> file. This has recently been 
-      fixed in LFS SVN.  Execute the following commands to work around a 
-      broken <filename>kd.h</filename> file.  The commands will only make the 
+      installed <filename>sys/kd.h</filename> file. This has recently been
+      fixed in LFS SVN.  Execute the following commands to work around a
+      broken <filename>kd.h</filename> file.  The commands will only make the
       modification if needed:</para>
 
@@ -130,5 +130,5 @@
 
     <para><command>sed -i '...' GL/glx/Makefile.in</command>: These commands
-    correct the search path for the <application>Mesa</application> headers.  
+    correct the search path for the <application>Mesa</application> headers.
     The 8th and 7th instance of '-I$(top_builddir)' in the existing search
     search path are replaced with <application>Mesa</application> paths.</para>
@@ -136,8 +136,8 @@
     <para><parameter>--with-mesa-source=...</parameter>: This switch directs
     the build system to the location of the <application>Mesa</application>
-    source directory.  If you wish to build without 
+    source directory.  If you wish to build without
     <application>Mesa</application>, omit this switch.</para>
 
-    <para><parameter>--with-module-dir=...</parameter>:  This parameter 
+    <para><parameter>--with-module-dir=...</parameter>:  This parameter
     sets the destination for the installed modules.</para>
 
@@ -146,9 +146,9 @@
 
     <para><parameter>--enable-install-setuid</parameter>: The Xorg binary must
-    run as the root user.  This switch ensures that the binary is installed 
+    run as the root user.  This switch ensures that the binary is installed
     setuid when <command>make</command> is run by an unprivileged user.</para>
 
     <para><parameter>--disable-glx</parameter>: Disable building of the GLX
-    extension.  This parameter is required if building without 
+    extension.  This parameter is required if building without
     <application>Mesa</application>.</para>
 
@@ -158,6 +158,6 @@
 
     <para><parameter>--disable-xprint</parameter>: Disable building of
-    the <application>Xprint</application>  extension and server.  This 
-    parameter is required if building without 
+    the <application>Xprint</application>  extension and server.  This
+    parameter is required if building without
     <application>Mesa</application>.</para>
 
Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision 04c940c34fb00b1a8d30a864bb7283ff4753a90d)
+++ x/installing/xbitmaps.xml	(revision c23b62bc4f435c75ed829b6b0e9c46c066821f5e)
@@ -37,5 +37,5 @@
   </indexterm>
 
-  <para>Xbitmaps provides static graphics needed by Xorg applications to 
+  <para>Xbitmaps provides static graphics needed by Xorg applications to
   draw screen elements.</para>
 
@@ -65,5 +65,5 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para><xref linkend="xorg7-util"/></para>
+  <para role="required"><xref linkend="xorg7-util"/></para>
 
   <para condition="html" role="usernotes">User Notes:
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision 04c940c34fb00b1a8d30a864bb7283ff4753a90d)
+++ x/installing/xterm.xml	(revision c23b62bc4f435c75ed829b6b0e9c46c066821f5e)
@@ -62,9 +62,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="xorg7-server"/> and
+    <para role="required"><xref linkend="xorg7-server"/> and
     <xref linkend="pkgconfig"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="luit"/></para>
+    <para role="optional"><xref linkend="luit"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -85,5 +85,5 @@
     <para>This package does not come with a test suite.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> 
+    <para>Now, as the <systemitem class="username">root</systemitem>
     user:</para>
 
@@ -97,5 +97,5 @@
 
     <para><parameter>--with-app-defaults=...</parameter>: Sets the location
-    for the <filename class="directory">app-defaults</filename> 
+    for the <filename class="directory">app-defaults</filename>
     directory.</para>
 
