docs-common/common legalnotice-content-en.xml, 1.5, 1.6 legalnotice-en.xml, 1.9, 1.10 legalnotice-relnotes-en.xml, 1.5, 1.6 legalnotice-section-en.xml, 1.2, 1.3

[Karsten Wade (kwade)]

Author: kwade

Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788

Modified Files:
	legalnotice-content-en.xml legalnotice-en.xml 
	legalnotice-relnotes-en.xml legalnotice-section-en.xml 
Log Message:
Hacks to get the release-notes to build, on the way to a better world.


Index: legalnotice-content-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- legalnotice-content-en.xml	11 Feb 2006 15:29:31 -0000	1.5
+++ legalnotice-content-en.xml	12 Feb 2006 18:26:52 -0000	1.6
@@ -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 at 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


Index: legalnotice-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-en.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- legalnotice-en.xml	3 Jun 2005 03:43:08 -0000	1.9
+++ legalnotice-en.xml	12 Feb 2006 18:26:52 -0000	1.10
@@ -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>


Index: legalnotice-relnotes-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-relnotes-en.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- legalnotice-relnotes-en.xml	2 Feb 2006 19:24:14 -0000	1.5
+++ legalnotice-relnotes-en.xml	12 Feb 2006 18:26:52 -0000	1.6
@@ -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


Index: legalnotice-section-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-section-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- legalnotice-section-en.xml	7 Feb 2006 21:18:48 -0000	1.2
+++ legalnotice-section-en.xml	12 Feb 2006 18:26:52 -0000	1.3
@@ -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>