Index: template/template.xml
===================================================================
--- template/template.xml	(revision ff769b8c6178dd8b799a5e122a2e6a5d69a22a2c)
+++ template/template.xml	(revision 42c2d70410dae874e97a3d8a6ad2944d5d5ddd47)
@@ -25,16 +25,22 @@
 
 <?dbhtml filename="TEMPLATE.html"?>
-<title><application>TEMPLATE</application>-&TEMPLATE-version;</title>
+<!-- No <application> tags in any title-->
+<title>TEMPLATE-&TEMPLATE-version;</title>
 <indexterm zone="TEMPLATE">
   <primary sortas="a-TEMPLATE">TEMPLATE</primary>
 </indexterm>
 
-<sect2>
-<title>Introduction to <application>TEMPLATE</application></title>
+<!-- Added role attibutes to <sect2> tags to allow to have a different look 
+for each section, if needed-->
+<sect2 role="package">
+<title>Introduction to TEMPLATE</title>
 
 <para>The <application>TEMPLATE</application> package contains... 
 This is useful for...</para>
 
-<sect3><title>Package information</title>
+<!-- Replaced <sect3> and <sect4> tags by <bridgehead> in this section
+to reduce the number of <sectX> to be processed if numbered sections is
+wanted in the future.-->
+<bridgehead renderas="sect3">Package information</bridgehead>
 <itemizedlist spacing="compact">
   <listitem><para>Download (HTTP): 
@@ -49,44 +55,47 @@
     &TEMPLATE-buildsize;</para></listitem>
   <listitem><para>Estimated build time: 
-    &TEMPLATE-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3>
-  <title>Additional downloads</title>
-  <itemizedlist spacing="compact">
-    <listitem><para>Required patch: <ulink 
-      url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para>
-    </listitem>
-  </itemizedlist>
-</sect3>
-
-<sect3><title><application>TEMPLATE</application> dependencies</title>
-  <sect4><title>Required</title>
-    <para><xref linkend="BLFS DEPENDENCY"/></para>
-  </sect4>
-
-  <sect4><title>Optional</title>
-    <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
-  </sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>TEMPLATE</application></title>
+    &TEMPLATE-time;</para></listitem>
+</itemizedlist>
+
+<bridgehead renderas="sect3">Additional downloads</bridgehead>
+<itemizedlist spacing="compact">
+  <listitem><para>Required patch: <ulink 
+    url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para>
+  </listitem>
+</itemizedlist>
+
+<bridgehead renderas="sect3">TEMPLATE dependencies</bridgehead>
+
+<bridgehead renderas="sect4">Required</bridgehead>
+<para><xref linkend="BLFS DEPENDENCY"/></para>
+
+<bridgehead renderas="sect4">Optional</bridgehead>
+<para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
+
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of TEMPLATE</title>
 
 <para>Install <application>TEMPLATE</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
+<!-- Removed <command> tags. For file creation commands <literal> tags must be added
+enclosing the actual text-->
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+<!--Added the test sute execution-->
+<para>To test the results, issue: <command>make check</command>.</para>
+
+<!--Added <systemitem> tag-->
+<para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!--Changed where the role attribute is placed-->
+<screen role="root"><userinput>make install</userinput></screen>
+
+</sect2>
+
+<sect2 role="commands">
 <title>Command explanations</title>
 
@@ -101,6 +110,6 @@
 </sect2>
 
-<sect2>
-<title>Configuring <application>TEMPLATE</application></title>
+<sect2 role="configuration">
+<title>Configuring TEMPLATE</title>
 
 <sect3 id="TEMPLATE-config">
@@ -119,10 +128,29 @@
 
 <sect3><title>Configuration information</title>
-
-  <para><userinput role='root'>USERINPUT GOES HERE</userinput> Blah blah blah 
-    about config.</para>
-
-  <para id="TEMPLATE-init">To automatically start the 
-    <command>TEMPLATE</command> daemon when the system is rebooted, install the 
+  
+  <!--Making this part more proper-->
+  <para>Blah blah blah about config.</para>
+
+<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
+  
+<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
+
+  <!-- File creation-->
+  <para>Create the file .... for ...</para>
+  
+<screen role="root"><userinput>cat &gt;&gt; /PATH/FILENAME &lt;&lt; "EOF"
+<literal># Begin FILENAME
+
+TEXT
+    
+# End FILENAME</literal>
+EOF</userinput></screen>
+    <!-- -->
+    
+  <sect3  id="TEMPLATE-init">
+  <title>Boot Scripts</title>
+  
+    <para>To automatically start the <command>TEMPLATE</command> daemon 
+    when the system is rebooted, install the 
     <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the 
     <xref linkend="intro-important-bootscripts"/> package.</para> 
@@ -132,10 +160,11 @@
   </indexterm> 
 
-<screen><userinput role='root'><command>make install-TEMPLATE</command></userinput></screen>
+<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
+
 </sect3>
 
 </sect2>
 
-<sect2>
+<sect2 role="content">
 <title>Contents</title>
 
@@ -146,9 +175,9 @@
 
   <seglistitem>
-    <seg>PROGRAM1, PROGRAM2 and PROGRAM3</seg>
-    <seg>libLIBRARY1, libLIBRARY2 and libLIBRARY3</seg>
+    <seg>PROGRAM1, PROGRAM2, and PROGRAM3</seg>
+    <seg>libLIBRARY1, libLIBRARY2, and libLIBRARY3</seg>
     <seg>/etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE, 
          /usr/share/TEMPLATE-&TEMPLATE-version;, 
-         /usr/share/doc/TEMPLATE-&TEMPLATE-version; and 
+         /usr/share/doc/TEMPLATE-&TEMPLATE-version;, and 
          /var/lib/TEMPLATE</seg>
   </seglistitem>
@@ -158,4 +187,6 @@
   <bridgehead renderas="sect3">Short Descriptions</bridgehead>
   <?dbfo list-presentation="list"?>
+  <!--Render this as a table for HTML output-->
+  <?dbhtml list-presentation="table"?>
 
 <!-- If the program or library name conflicts (is the same) as the 
