Index: template/README
===================================================================
--- template/README	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ template/README	(revision d3edf27c9ef5ed65b2756f4333c78fab548cf45e)
@@ -1,6 +1,4 @@
-These files are generic templates.
+This is a generic template.
  
-The newitem script makes a copy of the files and changes all occurances
-of template in them to the package name to save a lot of tedious work.
+Makes a copy of the file and edit as needed.
 
-Not all will always be needed
Index: mplate/newitem
===================================================================
--- template/newitem	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,37 +1,0 @@
-#!/bin/sh
-
-# Copies the template files and replaces template with the supplied package
-# name, greatly simplifying the process of adding a new package.
-
-if [ -z "$1" ]
-then
-  echo "Creates template files for a package and fills in the package name."
-  echo "Usage: $0 <written-package-name> <package-filename>"
-  echo
-  echo "Note that if you want to create the package Glib, you should"
-  echo "call the script as: '$0 Glib glib' so that the filenames are in"
-  echo "lower case.  If you only specify the first option, it is used"
-  echo "for both the written and filenames."
-  echo "Note also that *all* filenames in BLFS should be lower-case only"
-  exit 1
-fi
-
-WRITTENNAME=$1
-
-if [ -z "$2" ]
-then
- FILENAME=$WRITTENNAME
-else
- FILENAME=$2
-fi
-
-pushd `dirname $0`
-TEMPLDIR=`pwd`
-popd
- 
-for i in $TEMPLDIR/template*
-do
-  NEWFILE=`echo $i | sed s@$TEMPLDIR/template@$FILENAME@`
-  echo $NEWFILE
-  sed s/template/$WRITTENNAME/g $i > $NEWFILE
-done
Index: mplate/template-config.xml
===================================================================
--- template/template-config.xml	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application>template</application></title>
-
-<sect3><title>Config files</title>
-<para><filename>List of config files</filename></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: mplate/template-desc.xml
===================================================================
--- template/template-desc.xml	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>template</application> package contains <command>
-LISTOFEXEC</command>, <filename>LISTOFFILES</filename>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>item1</title>
-<para><command>item1</command> does this</para></sect3>
-
-<sect3><title>item2</title>
-<para><filename>item2</filename> does that</para></sect3>
-
-</sect2>
-
Index: mplate/template-exp.xml
===================================================================
--- template/template-exp.xml	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><command>COMMAND</command>: This command does something.</para>
-
-</sect2>
-
Index: mplate/template-inst.xml
===================================================================
--- template/template-inst.xml	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect2>
-<title>Installation of <application>template</application></title>
-
-<para>Install <application>template</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure </command></userinput></screen>
-
-</sect2>
-
Index: mplate/template-intro.xml
===================================================================
--- template/template-intro.xml	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<sect2>
-<title>Introduction to <application>template</application></title>
-
-<para>The <application>template</application> package contains... This is useful for...</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&template-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&template-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &template-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &template-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &template-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>template</application> dependencies</title>
-<sect4><title>Required</title>
-<para>DEPENDENCE LIST</para></sect4>
-<sect4><title>Optional</title>
-<para>OPTIONAL LIST</para></sect4>
-</sect3>
-
-</sect2>
Index: mplate/template.ent
===================================================================
--- template/template.ent	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<!ENTITY template SYSTEM "../template.xml">
-<!ENTITY template-intro SYSTEM "template-intro.xml">
-<!ENTITY template-inst SYSTEM "template-inst.xml">
-<!ENTITY template-exp SYSTEM "template-exp.xml">
-<!ENTITY template-desc SYSTEM "template-desc.xml">
-<!ENTITY template-config SYSTEM "template-config.xml">
-<!ENTITY template-buildsize "">
-<!ENTITY template-version "">
-<!ENTITY template-download-http "">
-<!ENTITY template-download-ftp "">
-<!ENTITY template-size "">
-<!ENTITY template-time "">
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 52d29f7a4212944c166ad666e105e261790e9621)
+++ template/template.xml	(revision d3edf27c9ef5ed65b2756f4333c78fab548cf45e)
@@ -1,11 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY template-buildsize "">
+  <!-- Place this in the general.ent file
+  <!ENTITY template-version ""> 
+  -->
+
+  <!ENTITY template-download-http "http://">
+  <!ENTITY template-download-ftp  "ftp://">
+  <!ENTITY template-size          "?? MB">
+  <!ENTITY template-time          "?? SBU">
+]>
+
 <sect1 id="template" xreflabel="template-&template-version;">
 <?dbhtml filename="template.html"?>
 <title>template-&template-version;</title>
 
-&template-intro;
-&template-inst;
-&template-exp;
-&template-config;
-&template-desc;
+
+<sect2>
+<title>Introduction to <application>template</application></title>
+
+<para>The <application>template</application> package contains... This is useful for...</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&template-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&template-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &template-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &template-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &template-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>template</application> dependencies</title>
+<sect4><title>Required</title>
+<para>DEPENDENCE LIST</para></sect4>
+<sect4><title>Optional</title>
+<para>OPTIONAL LIST</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>template</application></title>
+
+<para>Install <application>template</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure </command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>COMMAND</command>: This command does something.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>template</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>List of config files</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
+</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>template</application> package contains <command>
+LISTOFEXEC</command>, <filename>LISTOFFILES</filename>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>item1</title>
+<para><command>item1</command> does this</para></sect3>
+
+<sect3><title>item2</title>
+<para><filename>item2</filename> does that</para></sect3>
+
+</sect2>
 
 </sect1>
