use common entities file

4 files changed, 20 insertions, 24 deletions

diff --git a/docs-intro-en.xml b/docs-intro-en.xml
index 19e586f..90adb3c 100644
--- a/docs-intro-en.xml
+++ b/docs-intro-en.xml
@@ -1,11 +1,11 @@
-<!-- $Id: docs-intro-en.xml,v 1.2 2004/01/19 23:14:46 tfox Exp $ -->
+<!-- $Id: docs-intro-en.xml,v 1.3 2004/08/13 16:08:48 tfox Exp $ -->
 
   <preface id="ch-intro">
     <title>Introduction</title>
 
     <para>
        The goal of the Docs Project is to create easy-to-follow, task-based
-      documentation for &DISTRO; users and developers. Other than the
+      documentation for &FC; users and developers. Other than the
       <citetitle>&IG;</citetitle>, each tutorial should be in DocBook XML
       article format, with one article per topic. This way, writers can
       contribute documentation about a specific topic without having to worry
diff --git a/docs-tutorial-en.xml b/docs-tutorial-en.xml
index 3a0aca0..3d68f89 100644
--- a/docs-tutorial-en.xml
+++ b/docs-tutorial-en.xml
@@ -1,5 +1,4 @@
-<!-- $Id: docs-tutorial-en.xml,v 1.5 2004/08/12 21:17:05 tfox Exp $ -->
-
+<!-- $Id: docs-tutorial-en.xml,v 1.6 2004/08/13 16:08:48 tfox Exp $ -->
   <chapter id="ch-tutorial">
     <title>The Layout of a Tutorial</title>
   
@@ -7,7 +6,8 @@
     In this chapter, you will find an example of a &PROJECT; documentation
     parent file. This example is specific to the way the Docs Project uses
     DocBook XML. The parent file contains the main structural format of the
-    book, entities that should be used for this book specifically and more.
+    book, a link to the entities file that contain common entities that should
+    be used, and an entity to change the version and date of the tutorial.
   </para>
   
   <sect1 id="s1-tutorial-parent">
@@ -22,12 +22,12 @@
 &lt;!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-&lt;!ENTITY RH "Red Hat"&gt; &lt;!--The generic term "Red Hat" --&gt;
-&lt;!ENTITY FORMAL-RHI "&RH;, Inc."&gt; &lt;!--The generic term "Red Hat, Inc. --&gt;
-&lt;!ENTITY PROJECT "Fedora project"&gt; &lt;!-- Set the project name --&gt;
-&lt;!ENTITY NAME-TITLE "Fedora Project"&gt; &lt;!-- Set the project name, use for titles --&gt;
-&lt;!ENTITY DISTRO "Fedora Core"&gt; &lt;!-- Set the distro name --&gt;
-&lt;!ENTITY BOOKID "example-tutorial-0.1 (2003-07-07)"&gt; &lt;!-- change version of manual and date here --&gt;
+&lt;!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.xml"&gt;
+%FEDORA-ENTITIES-EN;
+
+&lt;!ENTITY VERSION "0.1"&gt;  &lt;!-- change version of tutorial here --&gt;
+
+&lt;!ENTITY BOOKID "example-tutorial-&amp;VERSION; (2003-07-07)"&gt; &lt;!-- change last modified date here --&gt;
 
 &lt;!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml"&gt;
 
diff --git a/docs-xml-tags-en.xml b/docs-xml-tags-en.xml
index af27ea7..0fc2ab0 100644
--- a/docs-xml-tags-en.xml
+++ b/docs-xml-tags-en.xml
@@ -1,4 +1,4 @@
-<!-- $Id: docs-xml-tags-en.xml,v 1.8 2004/08/12 21:33:45 tfox Exp $ -->
+<!-- $Id: docs-xml-tags-en.xml,v 1.9 2004/08/13 16:08:48 tfox Exp $ -->
 
   <chapter id="ch-xml-tags">
     <title>DocBook XML Tags</title>
@@ -191,7 +191,7 @@ browser.
 
 <screen>
 <computeroutput>
-&lt;!--$Id: docs-xml-tags-en.xml,v 1.8 2004/08/12 21:33:45 tfox Exp $ --&gt;
+&lt;!--$Id: docs-xml-tags-en.xml,v 1.9 2004/08/13 16:08:48 tfox Exp $ --&gt;
 
   &lt;chapter id="ch-sample"&gt;
     &lt;title&gt;Sample Chapter&lt;/title&gt;
@@ -511,7 +511,7 @@ To use the &lt;application&gt;Keyboard Configuration Tool&lt;/application&gt;, t
 <screen>
 <computeroutput>
 Nearly every modern-day operating system uses &lt;firstterm&gt;disk
-partitions&lt;/firstterm&gt;, and &DISTRO; is no exception.
+partitions&lt;/firstterm&gt;, and &FC; is no exception.
 </computeroutput>
 </screen>
 
@@ -521,7 +521,7 @@ partitions&lt;/firstterm&gt;, and &DISTRO; is no exception.
 
       <para>
 	Nearly every modern-day operating system uses <firstterm>disk
-	  partitions</firstterm>, and &DISTRO; is no exception.
+	  partitions</firstterm>, and &FC; is no exception.
       </para>
 
     </sect1>
@@ -1690,7 +1690,7 @@ own entry to refer to.
     &lt;partintro&gt;
       &lt;para&gt;This section contains information you will need when you first join
 	the Docs group. You might need to refer to this part again for
-	information such as installing &amp;DISTRO;.&lt;/para&gt;
+	information such as installing &amp;FC;.&lt;/para&gt;
     &lt;/partintro&gt;
 </computeroutput>
 </screen>
diff --git a/documentation-guide-en.xml b/documentation-guide-en.xml
index f77d1a6..4ffd001 100644
--- a/documentation-guide-en.xml
+++ b/documentation-guide-en.xml
@@ -1,14 +1,10 @@
-<!-- $Id: documentation-guide-en.xml,v 1.12 2004/08/13 15:35:53 tfox Exp $ -->
+<!-- $Id: documentation-guide-en.xml,v 1.13 2004/08/13 16:08:48 tfox Exp $ -->
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-<!ENTITY RH "Red Hat"> <!--The generic term "Red Hat" -->
-<!ENTITY FORMAL-RHI "&RH;, Inc."> <!--The generic term "Red Hat, Inc. -->
-<!ENTITY PROJECT "Fedora project"> <!-- Set the project name -->
-<!ENTITY NAME-TITLE "Fedora Project"> <!-- Set the project name, use for titles -->
-<!ENTITY DISTRO "Fedora Core"> <!-- Set the distro name -->
-<!ENTITY IG "&DISTRO; Installation Guide"> <!-- Always use for Installation Guide -->
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.xml">
+%FEDORA-ENTITIES-EN;
 
 <!ENTITY VERSION "0.2.3"> <!-- version for this document -->
 
@@ -34,7 +30,7 @@
 
 <book id="documentation-guide" lang="en">
   <bookinfo>
-    <title>&NAME-TITLE; Documentation Guide</title>
+    <title>&FP; Documentation Guide</title>
     <subtitle>Version &VERSION;</subtitle>
     <copyright>
       <year>2003,2004</year>