diff --git a/template/template.xml b/template/template.xml
index 9ea9985c06..9f35a69e90 100644
--- a/template/template.xml
+++ b/template/template.xml
@@ -45,8 +45,10 @@
   <sect2 role="package">
     <title>Introduction to TEMPLATE</title>
 
-    <para>The <application>TEMPLATE</application> package contains...
-    This is useful for...</para>
+    <para>
+      The <application>TEMPLATE</application> package contains...
+      This is useful for...
+    </para>
 
     <!-- if it builds but hasn't been tested: -->
     &lfs71_built;
@@ -57,22 +59,34 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&TEMPLATE-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&TEMPLATE-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&TEMPLATE-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&TEMPLATE-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &TEMPLATE-md5sum;</para>
+        <para>
+          Download MD5 sum: &TEMPLATE-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &TEMPLATE-size;</para>
+        <para>
+          Download size: &TEMPLATE-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &TEMPLATE-buildsize;</para>
+        <para>
+          Estimated disk space required: &TEMPLATE-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &TEMPLATE-time;</para>
+        <para>
+          Estimated build time: &TEMPLATE-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -80,29 +94,36 @@
     <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>
+        <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 role="required"><xref linkend="BLFS DEPENDENCY"/></para>
+    <para role="required">
+      <xref linkend="BLFS DEPENDENCY"/>
+    </para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL
-    DEPENDENCY</ulink>,
-    <xref linkend="BLFS DEPENDENCY"/></para>
+    <para role="recommended">
+      <ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink> and
+      <xref linkend="BLFS DEPENDENCY"/>.
+    </para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL
-    DEPENDENCY</ulink></para>
+    <para role="optional">
+      <ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>.
+    </para>
 
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/TEMPLATE"/></para>
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
+    </para>
   </sect2>
 
   <!-- Optional section for packages that need a specific kernel
@@ -110,8 +131,10 @@
   <sect2 role="kernel" id="TEMPLATE-kernel">
     <title>Kernel Configuration</title>
 
-    <para>Enable the following options in the kernel configuration
-    and recompile the kernel if necessary:</para>
+    <para>
+      Enable the following options in the kernel configuration and recompile the
+      kernel if necessary:
+    </para>
 
 <!-- Spaces are significant in <screen> sections -->
 <screen><literal>Master section:
@@ -119,8 +142,10 @@
     Required Option: M or Y
     Incompatible option: N</literal></screen>
 
-    <para>Select the appropriate sub-options that appear when the above options
-    are selected.</para>
+    <para>
+      Select the appropriate sub-options that appear when the above options are
+      selected.
+    </para>
 
     <indexterm zone="TEMPLATE TEMPLATE-kernel">
       <primary sortas="d-TEMPLATE">TEMPLATE</primary>
@@ -131,11 +156,13 @@
   <sect2 role="installation">
     <title>Installation of TEMPLATE</title>
 
-    <para>Install <application>TEMPLATE</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>TEMPLATE</application> by running the following
+      commands:
+    </para>
 
 <!-- Spaces are significant in <screen> sections -->
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
     <!-- Optional section. Use one of the two mentions below about a test
@@ -143,11 +170,17 @@ make</userinput></screen>
          test suite uses syntax other than 'make check', revise the
          line to reflect the actual syntax to run the test suite -->
 
-    <para>This package does not come with a test suite.</para>
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
@@ -156,13 +189,24 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>COMMAND</command>: This command does something.</para>
+    <para>
+      <option>--disable-static</option>: This prevents the installation of
+      static versions of the libraries.
+    </para>
 
-    <para><parameter>--SWITCH=PARAMETER</parameter>: This parameter does
-    something mandatory for BLFS purposes.</para>
+    <para>
+      <command>COMMAND</command>: This command does something.
+    </para>
 
-    <para><option>--OPTION</option>: This option does something optionally
-    per the user's desires.</para>
+    <para>
+      <parameter>--SWITCH=PARAMETER</parameter>: This parameter does something
+      mandatory for BLFS purposes.
+    </para>
+
+    <para>
+      <option>--OPTION</option>: This option does something optionally per the
+      user's desires.
+    </para>
   </sect2>
 
   <!--Optional section-->
@@ -171,8 +215,10 @@ make</userinput></screen>
 
     <sect3 id="TEMPLATE-config">
       <title>Config Files</title>
-      <para><filename>~/.Configfilename1</filename> and
-      <filename>/etc/path/Configfilename2</filename></para>
+      <para>
+        <filename>~/.Configfilename1</filename> and
+        <filename>/etc/path/Configfilename2</filename>.
+      </para>
 
       <indexterm zone="TEMPLATE TEMPLATE-config">
         <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
@@ -186,14 +232,18 @@ make</userinput></screen>
 
     <sect3><title>Configuration Information</title>
 
-      <para>Blah blah blah about config.</para>
+      <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. Add the appropriate <indexterm> block if needed.-->
-      <para>Create the file .... for ...</para>
+      <para>
+        Create the file .... for ...
+      </para>
 
 <screen role="root"><userinput>cat &gt;&gt; /PATH/FILENAME &lt;&lt; "EOF"
 <literal># Begin FILENAME
@@ -207,11 +257,12 @@ EOF</userinput></screen>
     <sect3  id="TEMPLATE-init">
       <title>Boot Script</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="bootscripts"/> package.</para>
+      <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="bootscripts"/> package.
+      </para>
 
       <indexterm zone="TEMPLATE TEMPLATE-init">
         <primary sortas="f-TEMPLATE">TEMPLATE</primary>
@@ -231,12 +282,18 @@ EOF</userinput></screen>
       <segtitle>Installed Director(y,ies)</segtitle>
 
       <seglistitem>
-        <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
-        /var/lib/TEMPLATE</seg>
+        <seg>
+          PROGRAM1, PROGRAM2 and PROGRAM3.
+        </seg>
+        <seg>
+          libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so.
+        </seg>
+        <seg>
+          /etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
+          /usr/share/TEMPLATE-&TEMPLATE-version;,
+          /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
+          /var/lib/TEMPLATE.
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -252,7 +309,9 @@ EOF</userinput></screen>
       <varlistentry id="PROGRAM1">
         <term><command>PROGRAM1</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>
+            does this .....
+          </para>
           <indexterm zone="TEMPLATE PROGRAM1">
             <primary sortas="b-PROGRAM1">PROGRAM1</primary>
           </indexterm>
@@ -262,7 +321,9 @@ EOF</userinput></screen>
       <varlistentry id="PROGRAM2">
         <term><command>PROGRAM2</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>
+            does this .....
+          </para>
           <indexterm zone="TEMPLATE PROGRAM2">
             <primary sortas="b-PROGRAM2">PROGRAM2</primary>
           </indexterm>
@@ -270,11 +331,13 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.{so,a}</filename></term>
+        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>
+            contains functions that .....
+          </para>
           <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.{so,a}</primary>
+            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>