Now with 100% extra validation

3 files changed, 28 insertions, 42 deletions

diff --git a/en_US/acknowledgments.xml b/en_US/acknowledgments.xml
index c7dc535..9a71775 100644
--- a/en_US/acknowledgments.xml
+++ b/en_US/acknowledgments.xml
@@ -1,3 +1,12 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** Bring in Fedora entities *************** -->
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fdp-entities.ent">
+%FEDORA-ENTITIES-EN;
+
+]>
+
   <chapter id="acknowledgments">
     <title>Acknowledgments</title>
 
diff --git a/en_US/documentation-guide.xml b/en_US/documentation-guide.xml
index 55b5f1f..1d9ae2f 100644
--- a/en_US/documentation-guide.xml
+++ b/en_US/documentation-guide.xml
@@ -1,7 +1,8 @@
-<!-- $Id: documentation-guide.xml,v 1.1 2006/11/23 02:24:17 pfrields Exp $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: documentation-guide.xml,v 1.2 2006/11/29 00:29:48 pfrields Exp $ -->
 <!-- breaks the build ... <?xml version="1.0" encoding="utf-8"?> -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- *************** Bring in Fedora entities *************** -->
 <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fdp-entities.ent">
@@ -13,40 +14,8 @@
 
 ]>
 
-<book id="documentation-guide" lang="en">
-  <bookinfo>
-    <title>&FP; Documentation Guide</title>
-    <subtitle>Version &VERSION;</subtitle>
-    <copyright>
-      <year>2003</year>
-      <year>2004</year>
-      <year>2005</year>
-      <holder>&FORMAL-RHI;</holder>
-      <holder>Tammy Fox</holder>
-      <holder>Johnray Fuller</holder>
-      <holder>Sandra Moore</holder>
-      <holder>Paul W. Frields</holder>
-    </copyright>
-    <authorgroup>
-      <author>
-	<surname>Fox</surname>
-	<firstname>Tammy</firstname>
-      </author>
-      <author>
-	<surname>Fuller</surname>
-	<firstname>Johnray</firstname>
-      </author>
-      <author>
-	<surname>Moore</surname>
-	<firstname>Sandra</firstname>
-      </author>
-      <author>
-	<surname>Frields</surname>
-	<firstname>Paul</firstname>
-	<othername role="mi">W.</othername>
-      </author>
-    </authorgroup>
-  </bookinfo>
+<book id="documentation-guide" lang="en_US">
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fdp-info.xml" />
 
   <!--  INTRODUCTION -->
   <xi:include href="docs-intro.xml" xpointer="element(ch-intro)"
@@ -65,9 +34,9 @@
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <!-- EMACS-NXML --> 
-  <!-- This chapter needs editing, exclude it for now. -->
-  <!-- <xi:include href="docs-emacs-nxml.xml" xpointer="element(ch-emacs-nxml)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+  <!-- This chapter needs editing, but we can't exclude it now. -->
+  <xi:include href="docs-emacs-nxml.xml" xpointer="element(ch-emacs-nxml)"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <!-- VIM --> 
   <xi:include href="docs-vim.xml" xpointer="element(ch-vim)"
diff --git a/en_US/rpm-info.xml b/en_US/rpm-info.xml
index 5caaa6b..584bd55 100644
--- a/en_US/rpm-info.xml
+++ b/en_US/rpm-info.xml
@@ -32,6 +32,14 @@
     <holder>Paul W. Frields</holder>
   </copyright>
   <title>Fedora Documentation Guide</title>
-  <desc>Guidelines and procedures for producing documentation for &FED;</desc>
-  <changelog order="newest-first"/>
+  <desc>Guidelines and procedures for producing documentation for Fedora</desc>
+  <changelog order="newest-first">
+    <revision date="2005-09-18" number="0.2.6.3">
+      <author worker="PaulWFrields"/>
+      <author worker="TammyFox"/>
+      <author worker="JohnrayFuller"/>
+      <author worker="SandraMoore"/>
+      <details>Update to new build requirements</details>
+    </revision>
+  </changelog>
 </rpm-info>