Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision ff887651bcf55d3ef3d29720ce0343f95b8638c5)
+++ xsoft/graphweb/firefox.xml	(revision b81991e10138b85201b053588c38e5e55b492fb5)
@@ -14,68 +14,78 @@
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="firefox.html" ?>
-<title>Firefox-&firefox-version;</title>
-<indexterm zone="firefox">
-<primary sortas="a-Firefox">Firefox</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application>Firefox</application></title>
-
-<para><application>Firefox</application> is a stand-alone browser
-based on the <application>Mozilla</application> codebase.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&firefox-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&firefox-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &firefox-md5sum;</para></listitem>
-<listitem><para>Download size: &firefox-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&firefox-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&firefox-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Firefox</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="gtk2"/>, 
-<xref linkend="libidl"/> and 
-<xref linkend="zip"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="unzip"/>, 
-<xref linkend="gnome-vfs"/> and 
-<xref linkend="libgnome"/> (to build the gnomevfs extension), 
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/> 
-(for the GSSAPI libraries to build the negotiateauth extension), 
-<xref linkend="doxygen"/>, 
-<ulink url="http://xprint.mozdev.org/">Xprint</ulink>, 
-<ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and 
-<ulink url="http://cairographics.org/">Cairo</ulink></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Firefox</application></title>
-
-<para>The configuration of <application>Firefox</application> is very similar 
-to <xref linkend="mozilla"/> and hence the options are not discussed. Refer to 
-the <xref linkend="mozilla"/> instructions for explanations and additional 
-configuration information.</para>
-
-<para>Compile and install <application>Firefox</application> by
-running the following commands:</para>
-
-<screen><userinput><command>export MOZILLA_OFFICIAL="1" &amp;&amp;
+  <?dbhtml filename="firefox.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Firefox-&firefox-version;</title>
+
+  <indexterm zone="firefox">
+    <primary sortas="a-Firefox">Firefox</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Firefox</title>
+
+    <para><application>Firefox</application> is a stand-alone browser
+    based on the <application>Mozilla</application> codebase.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&firefox-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&firefox-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &firefox-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &firefox-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &firefox-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &firefox-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="gtk2"/>,
+    <xref linkend="libidl"/> and
+    <xref linkend="zip"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="libjpeg"/>,
+    <xref linkend="unzip"/>,
+    <xref linkend="gnome-vfs"/> and
+    <xref linkend="libgnome"/> (to build the gnomevfs extension),
+    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>
+    (for the GSSAPI libraries to build the negotiateauth extension),
+    <xref linkend="doxygen"/>,
+    <ulink url="http://xprint.mozdev.org/">Xprint</ulink>,
+    <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and
+    <ulink url="http://cairographics.org/">Cairo</ulink></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Firefox</title>
+
+    <para>The configuration of <application>Firefox</application> is very
+    similar to <xref linkend="mozilla"/> and hence the options are not
+    discussed. Refer to the <xref linkend="mozilla"/> instructions for
+    explanations and additional configuration information.</para>
+
+    <para>Compile and install <application>Firefox</application> by
+    running the following commands:</para>
+
+<screen><userinput>export MOZILLA_OFFICIAL="1" &amp;&amp;
 export BUILD_OFFICIAL="1" &amp;&amp;
 export MOZ_PHOENIX="1" &amp;&amp;
@@ -109,112 +119,122 @@
             --disable-composer \
             --disable-profilesharing &amp;&amp;
-make</command></userinput></screen>
-
-<para>You should add the <option>--with-system-jpeg</option> switch to the 
-<command>configure</command> script if you have 
-<application>libjpeg</application> installed.</para>
-
-<para>This package does not come with a test suite.</para>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
+make</userinput></screen>
+
+    <para>You should add the <option>--with-system-jpeg</option> switch
+    to the <command>configure</command> script if you have
+    <application>libjpeg</application> installed.</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 -d /usr/include/firefox-&firefox-version;/nss &amp;&amp;
 cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
-    /usr/include/firefox-&firefox-version;/nss</command></userinput></screen>
-
-<para>To enable multi-user operation, execute the following as the root 
-user:</para>
-
-<screen><userinput role='root'><command>cd /usr/lib/firefox-&firefox-version; &amp;&amp;
+    /usr/include/firefox-&firefox-version;/nss</userinput></screen>
+
+    <para>To enable multi-user operation, execute the following as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cd /usr/lib/firefox-&firefox-version; &amp;&amp;
 export LD_LIBRARY_PATH="$PWD" &amp;&amp;
 export MOZILLA_FIVE_HOME="$PWD" &amp;&amp;
 ./regxpcom &amp;&amp;
 ./regchrome &amp;&amp;
-touch `find . -name *.rdf`</command></userinput></screen>
-
-<note><para>You should run <command>/usr/bin/firefox</command> once as the 
-root user (or any user with write privileges) to create some necessary 
-additional files in the <filename class='directory'>/usr</filename> 
-hierarchy.</para></note>
-
-<para>Lastly, unset the build variables from the unprivileged user's 
-environment:</para>
-
-<screen><userinput><command>unset MOZILLA_OFFICIAL &amp;&amp;
+touch `find . -name *.rdf`</userinput></screen>
+
+    <note>
+      <para>You should run <command>/usr/bin/firefox</command> once as the
+      <systemitem class="username">root</systemitem> user (or any user with
+      write privileges) to create some necessary additional files in the
+      <filename class='directory'>/usr</filename> hierarchy.</para>
+    </note>
+
+    <para>Lastly, unset the build variables from the unprivileged user's
+    environment:</para>
+
+<screen><userinput>unset MOZILLA_OFFICIAL &amp;&amp;
 unset BUILD_OFFICIAL &amp;&amp;
-unset MOZ_PHOENIX</command></userinput></screen>
-</sect2>
-
-<sect2>
-<title>Configuring <application>Firefox</application></title>
-
-<para>No specific configuration is required as long as the 
-<command>firefox</command> script is in the user's path. If 
-<application>Firefox</application> is installed in a non-standard location, 
-then make a symlink to the <command>firefox</command> script from
-<filename class="directory">/usr/bin</filename>.</para>
-
-<para>Many applications look for <command>netscape</command> when they need to
-open a browser. You may make the following symlink for convenience (as the
-root user).</para>
-
-<screen><userinput role='root'><command>ln -v -sf firefox /usr/bin/netscape</command></userinput></screen>
-
-<para>For installing various <application>Firefox</application> plugins, refer
-to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc
-Project</ulink>. If you have <xref linkend="jdk"/> already installed, create
-the following link as the root user to utilize the
-<application>JAVA</application> plugin: </para>
-
-<screen><userinput role='root'><command>ln -v -s $JAVA_HOME/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-    /usr/lib/firefox-&firefox-version;/plugins</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>firefox and firefox-config</seg>
-<seg>Numerous libraries, browser components, plugins, extensions and helper 
-modules installed in 
-<filename class='directory'>/usr/lib/firefox-&firefox-version;</filename></seg>
-<seg>/usr/bin/defaults, /usr/include/firefox-&firefox-version;, 
-/usr/lib/firefox-&firefox-version; and 
-/usr/share/idl/firefox-&firefox-version;</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="firefox-prog">
-<term><command>firefox</command></term>
-<listitem><para>is the next-generation browser from Mozilla.</para>
-<indexterm zone="firefox firefox-prog">
-<primary sortas="b-firefox">firefox</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="firefox-config">
-<term><command>firefox-config</command></term>
-<listitem><para>determines the compile and linker flags that should be
-used to compile and link programs that use
-<application>Firefox</application> libraries and browser
-components.</para>
-<indexterm zone="firefox firefox-config">
-<primary sortas="b-firefox-config">firefox-config</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+unset MOZ_PHOENIX</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Firefox</title>
+
+    <para>No specific configuration is required as long as the
+    <command>firefox</command> script is in the user's path. If
+    <application>Firefox</application> is installed in a non-standard location,
+    then make a symlink to the <command>firefox</command> script from
+    <filename class="directory">/usr/bin</filename>.</para>
+
+    <para>Many applications look for <command>netscape</command> when they
+    need to open a browser. You may make the following symlink for convenience
+    (as the <systemitem class="username">root</systemitem> user).</para>
+
+<screen role="root"><userinput>ln -v -sf firefox /usr/bin/netscape</userinput></screen>
+
+    <para>For installing various <application>Firefox</application> plugins,
+    refer to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's
+    PluginDoc Project</ulink>. If you have <xref linkend="jdk"/> already
+    installed, create the following link as the
+    <systemitem class="username">root</systemitem> user to utilize the
+    <application>JAVA</application> plugin: </para>
+
+<screen role="root"><userinput>ln -v -s $JAVA_HOME/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+    /usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>firefox and firefox-config</seg>
+        <seg>Numerous libraries, browser components, plugins, extensions, and
+        helper modules installed in <filename
+        class='directory'>/usr/lib/firefox-&firefox-version;</filename></seg>
+        <seg>/usr/bin/defaults, /usr/include/firefox-&firefox-version;,
+        /usr/lib/firefox-&firefox-version;, and
+        /usr/share/idl/firefox-&firefox-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="firefox-prog">
+        <term><command>firefox</command></term>
+        <listitem>
+          <para>is the next-generation browser from Mozilla.</para>
+          <indexterm zone="firefox firefox-prog">
+            <primary sortas="b-firefox">firefox</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firefox-config">
+        <term><command>firefox-config</command></term>
+        <listitem>
+          <para>determines the compile and linker flags that should be
+          used to compile and link programs that use
+          <application>Firefox</application> libraries and browser
+          components.</para>
+          <indexterm zone="firefox firefox-config">
+            <primary sortas="b-firefox-config">firefox-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
