Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision 88a311cd0d3b5aaaeadc0dbd7ed4e5665229c3dd)
+++ general/genutils/screen.xml	(revision 5b6516dbe7aba0f41e8f24775ada2a7b0816db32)
@@ -5,130 +5,150 @@
   %general-entities;
 
-<!ENTITY screen-download-http "http://ftp.gnu.org/pub/gnu/screen/screen-&screen-version;.tar.gz">
-<!ENTITY screen-download-ftp "ftp://ftp.gnu.org/pub/gnu/screen/screen-&screen-version;.tar.gz">
-<!ENTITY screen-md5sum "ed68ea9b43d9fba0972cb017a24940a1">
-<!ENTITY screen-size "825 KB">
-<!ENTITY screen-buildsize "5.8 MB">
-<!ENTITY screen-time "0.17 SBU">
+  <!ENTITY screen-download-http "http://ftp.gnu.org/pub/gnu/screen/screen-&screen-version;.tar.gz">
+  <!ENTITY screen-download-ftp "ftp://ftp.gnu.org/pub/gnu/screen/screen-&screen-version;.tar.gz">
+  <!ENTITY screen-md5sum "ed68ea9b43d9fba0972cb017a24940a1">
+  <!ENTITY screen-size "825 KB">
+  <!ENTITY screen-buildsize "5.8 MB">
+  <!ENTITY screen-time "0.17 SBU">
 ]>
 
 <sect1 id="screen" xreflabel="Screen-&screen-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="screen.html"?>
-<title>Screen-&screen-version;</title>
-<indexterm zone="screen">
-<primary sortas="a-Screen">Screen</primary>
-</indexterm>
+  <?dbhtml filename="screen.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>Screen-&screen-version;</title>
+  
+  <indexterm zone="screen">
+    <primary sortas="a-Screen">Screen</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application>Screen</application></title>
+  <sect2 role="package">
+    <title>Introduction to Screen</title>
+    
+    <para><application>Screen</application> is a terminal multiplexor that
+    runs several separate processes, typically interactive shells, on a single 
+    physical character-based terminal. Each virtual terminal emulates a DEC 
+    VT100 plus several ANSI X3.64 and ISO 2022 functions and also supports
+    configurable input and output translation, serial port support, configurable 
+    logging, multi-user support, and UTF-8 character encoding support (currently 
+    not supported by LFS). Screen sessions can be detached and resumed
+    later on a different terminal.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&screen-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&screen-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &screen-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &screen-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &screen-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &screen-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">Screen Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="Linux_PAM"/></para>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of Screen</title>
 
-<para><application>Screen</application> is a terminal multiplexor that
-runs several separate processes, typically interactive shells, on a
-single physical character-based terminal. Each virtual terminal emulates
-a <acronym>DEC</acronym> VT100 plus several <acronym>ANSI</acronym>
-X3.64 and <acronym>ISO</acronym> 2022 functions and also supports
-configurable input and output translation, serial port support,
-configurable logging, multi-user support, and <acronym>UTF</acronym>-8
-character encoding support (currently not supported by
-<acronym>LFS</acronym>). Screen sessions can be detached and resumed
-later on a different terminal.</para>
+    <para>Install <application>Screen</application> by running the
+    following commands:</para>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&screen-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&screen-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: 
-&screen-md5sum;</para></listitem>
-<listitem><para>Download size: 
-&screen-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&screen-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&screen-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Screen</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Screen</application></title>
-
-<para>Install <application>Screen</application> by running the
-following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr --with-socket-dir=/var/run/screen \
+<screen><userinput>./configure --prefix=/usr --with-socket-dir=/var/run/screen \
     --with-sys-screenrc=/etc/screenrc &amp;&amp;
 sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make install &amp;&amp;
+install -m 644 etc/etcscreenrc /etc/screenrc</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="configuration">
+    <title>Configuring Screen</title>
 
-<para>Now, as the root user:</para>
+    <sect3 id ="screen-config">
+      <title>Config Files</title>
+      
+      <para><filename>/etc/screenrc</filename> and 
+      <filename>~/.screenrc</filename></para>
+          
+      <indexterm zone="screen screen-config">
+        <primary sortas="e-AA.screenrc">~/.screenrc</primary>
+      </indexterm>
+      
+      <indexterm zone="screen screen-config">
+        <primary sortas="e-etc-screenrc">/etc/screenrc</primary>
+      </indexterm>
+    
+    </sect3>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
-install -m 644 etc/etcscreenrc /etc/screenrc</command></userinput></screen>
+    <sect3>
+      <title>Configuration Information</title>
+      
+      <para>You may want to look at the example configuration file that was 
+      installed and customize it for your needs.</para>
+    
+    </sect3>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-</sect2>
-
-<sect2>
-<title>Configuring <application>Screen</application></title>
-
-<sect3 id ="screen-config"><title>Config files</title>
-<para><filename>/etc/screenrc</filename> and 
-<filename>~/.screenrc</filename>
-</para>
-<indexterm zone="screen screen-config">
-<primary sortas="e-AA.screenrc">~/.screenrc</primary></indexterm>
-<indexterm zone="screen screen-config">
-<primary sortas="e-etc-screenrc">/etc/screenrc</primary></indexterm>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-<para>You may want to look at the example configuration file that was 
-installed and customize it for your needs.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>screen</seg>
-<seg>None</seg>
-<seg>/var/run/screen</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="screen-prog">
-<term><command>screen</command></term>
-<listitem><para>is a terminal multiplexor with VT100/<acronym>ANSI</acronym> 
-terminal emulation.</para>
-<indexterm zone="screen screen-prog">
-<primary sortas="b-screen">screen</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-</sect2>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>screen</seg>
+        <seg>None</seg>
+        <seg>/var/run/screen</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="screen-prog">
+        <term><command>screen</command></term>
+        <listitem>
+          <para>is a terminal multiplexor with VT100/ANSI 
+          terminal emulation.</para>
+          <indexterm zone="screen screen-prog">
+            <primary sortas="b-screen">screen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
+    
+  </sect2>
 
 </sect1>
