Hacks to get the release-notes to build, on the way to a better world.

4 files changed, 19 insertions, 15 deletions

diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml
index 21f4439..4d8595c 100644
--- a/common/legalnotice-content-en.xml
+++ b/common/legalnotice-content-en.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
 "http://www.docbook.org/xml/4.4/docbookx.dtd"[
-
- <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "./fedora-entities-en.ent">
- %FEDORA-ENTITIES-EN;
-
 ]>
 <section id="sn-legalnotice-content">
   <title>Legal Notice</title>
@@ -30,17 +26,23 @@
     caution, and warning).
     Tommy Reynolds <email>Tommy.Reynolds@MegaCoder.com</email> created the callout graphics.
     They all may be freely redistributed with documentation
-    produced for the &PROJECT;.
+    produced for the <!-- &PROJECT; --> Fedora Project.
   </para>
-
+<!-- 
   <para>
-    &DOCID;
+   &DOCID;
   </para>
-
+-->
+<!--
   <para>
     &RH; and the &RH; "Shadow Man" logo are registered trademarks of
     &FORMAL-RHI; in the United States and other countries.
   </para>
+-->
+  <para>
+    Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
+    Red Hat, Inc. in the United States and other countries.
+  </para>
 
   <para>
     All other trademarks and copyrights referred to are the property of their
diff --git a/common/legalnotice-en.xml b/common/legalnotice-en.xml
index 3d8bf05..b514297 100644
--- a/common/legalnotice-en.xml
+++ b/common/legalnotice-en.xml
@@ -8,5 +8,6 @@
 ]>
 -->
 <legalnotice id="legalnotice">
-&LEGALNOTICE-CONTENT;
+  <xi:include href="./legalnotice-content-en.xml" xpointer="element(sn-legalnotice-content)"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 </legalnotice>
diff --git a/common/legalnotice-relnotes-en.xml b/common/legalnotice-relnotes-en.xml
index e103d2c..1acf41f 100644
--- a/common/legalnotice-relnotes-en.xml
+++ b/common/legalnotice-relnotes-en.xml
@@ -31,7 +31,7 @@
     <para>
       These release notes may be updated.  Visit <ulink
 	url="http://fedora.redhat.com/docs/release-notes/">http://fedora.redhat.com/docs/release-notes/</ulink>
-      to view the latest release notes for &DISTRO; &DISTROVER;.
+      to view the latest release notes for Fedora Core 5 test3<!-- &DISTRO; &DISTROVER;-->.
     </para>
     <para>
       Another source for updated information about the test release is <ulink
diff --git a/common/legalnotice-section-en.xml b/common/legalnotice-section-en.xml
index d2c7a7e..b53b09e 100644
--- a/common/legalnotice-section-en.xml
+++ b/common/legalnotice-section-en.xml
@@ -14,13 +14,14 @@
 
   If you use this legalnotice, you must include a call to the
   LEGALNOTICE-NOCHUNKS or LEGALNOTICE-RELNOTES.  This gets the legal material in
-  the proper <legalnotice /> container.SECTION entity, or include a similar <section> in your document.
-  The call to LEGALNOTICE-SECTION must happen where a <section> is otherwise
-  allowed.  One good location is immediately following an introduction.
+  the proper <legalnotice /> container.SECTION entity, or include a similar
+  <section> in your document.  The call to LEGALNOTICE-SECTION must happen where
+  a <section> is otherwise allowed.  One good location is immediately following
+  an introduction.
 
   -->
   <section id="sn-legalnotice">
-    <title>Legal Notice</title>
-      <xi:include href="./legalnotice-content-en.xml"
+  <title>Legal Notice</title> 
+   <xi:include href="./legalnotice-content-en.xml" xpointer="element(sn-legalnotice-content)"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
   </section>