This is just a little hackish. With the legalnotice inline, it ruined the effect of the new release notes style and what's new content. These changes, plus changes to the relnotes parent, pull a special relnotes legalnotice in that has a single sentence and links to an appendix with the full legalnotice content. This is not semantically correct, there must be a way to handle this in the XSL so that the legalnotice content is properly contained throughout. This hack can stand until I find the XSL fix, because sometimes Pretty is more important than Right.

4 files changed, 90 insertions, 73 deletions

diff --git a/common/fedora-entities-en.ent b/common/fedora-entities-en.ent
index 143e3ac..6d318cb 100644
--- a/common/fedora-entities-en.ent
+++ b/common/fedora-entities-en.ent
@@ -1,4 +1,4 @@
-<!-- $Id: fedora-entities-en.ent,v 1.2 2005/05/31 23:49:51 kwade Exp $ -->
+<!-- $Id: fedora-entities-en.ent,v 1.3 2005/06/03 03:43:08 kwade Exp $ -->
 
 <!--
   These common entities are useful shorthand 
@@ -45,6 +45,8 @@
 
 <!-- ************** common doc files *********** -->
 <!ENTITY LEGALNOTICE SYSTEM "./legalnotice-en.xml">
+<!ENTITY LEGALNOTICE-CONTENT SYSTEM "./legalnotice-content-en.xml">
+<!ENTITY LEGALNOTICE-RELNOTES SYSTEM "./legalnotice-relnotes-en.xml">
 
 <!-- ************** common applications? *********** -->
 
diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml
new file mode 100644
index 0000000..4e4662e
--- /dev/null
+++ b/common/legalnotice-content-en.xml
@@ -0,0 +1,71 @@
+
+  <para>
+    Permission is granted to copy, distribute, and/or modify this document under
+    the terms of the GNU Free Documentation License, Version 1.2 or any later
+    version published by the Free Software Foundation; with no Invariant
+    Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the
+    license is available at <ulink
+    url="http://www.gnu.org/licenses/fdl.html">http://www.gnu.org/licenses/fdl.html</ulink>.
+  </para>
+
+  <para>
+    This document may be copied and distributed in any medium, either
+    commercially or noncommercially, provided that the GNU Free Documentation
+    License (FDL), the copyright notices, and the license notice saying the GNU
+    FDL applies to the document are reproduced in all copies, and that you add
+    no other conditions whatsoever to those of the GNU FDL.
+  </para>
+
+  <para>
+    Garrett LeSage created the admonition graphics (note, tip, important,
+    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;.
+    </para>
+
+  <para>
+    &BOOKID;
+  </para>
+
+  <para>
+    &RH;, &RH; Network, the &RH; "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
+    Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts,
+    Rawhide and all &RH;-based trademarks and logos are trademarks or registered
+    trademarks of &FORMAL-RHI; in the United States and other countries.
+  </para>
+
+  <para>
+    Linux is a registered trademark of Linus Torvalds.
+  </para>
+
+  <para>
+    Motif and UNIX are registered trademarks of The Open Group.
+  </para>
+
+  <para>
+    Intel and Pentium are registered trademarks of Intel Corporation. Itanium
+    and Celeron are trademarks of Intel Corporation.
+  </para>
+
+  <para>
+    AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro
+    Devices, Inc.
+  </para>
+
+  <para>
+    Windows is a registered trademark of Microsoft Corporation.
+  </para>
+
+  <para>
+    SSH and Secure Shell are trademarks of SSH Communications Security, Inc.
+  </para>
+
+  <para>
+    FireWire is a trademark of Apple Computer Corporation.
+  </para>
+
+  <para>
+    All other trademarks and copyrights referred to are the property of their
+    respective owners.
+  </para>
diff --git a/common/legalnotice-en.xml b/common/legalnotice-en.xml
index 1dde6ce..3d8bf05 100644
--- a/common/legalnotice-en.xml
+++ b/common/legalnotice-en.xml
@@ -8,76 +8,5 @@
 ]>
 -->
 <legalnotice id="legalnotice">
-
-  <para>
-    Permission is granted to copy, distribute, and/or modify this document under
-    the terms of the GNU Free Documentation License, Version 1.2 or any later
-    version published by the Free Software Foundation; with no Invariant
-    Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the
-    license is available at <ulink
-    url="http://www.gnu.org/licenses/fdl.html">http://www.gnu.org/licenses/fdl.html</ulink>.
-  </para>
-
-  <para>
-    This document may be copied and distributed in any medium, either
-    commercially or noncommercially, provided that the GNU Free Documentation
-    License (FDL), the copyright notices, and the license notice saying the GNU
-    FDL applies to the document are reproduced in all copies, and that you add
-    no other conditions whatsoever to those of the GNU FDL.
-  </para>
-
-  <para>
-    Garrett LeSage created the admonition graphics (note, tip, important,
-    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;.
-    </para>
-
-  <para>
-    &BOOKID;
-  </para>
-
-  <para>
-    &RH;, &RH; Network, the &RH; "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
-    Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts,
-    Rawhide and all &RH;-based trademarks and logos are trademarks or registered
-    trademarks of &FORMAL-RHI; in the United States and other countries.
-  </para>
-
-  <para>
-    Linux is a registered trademark of Linus Torvalds.
-  </para>
-
-  <para>
-    Motif and UNIX are registered trademarks of The Open Group.
-  </para>
-
-  <para>
-    Intel and Pentium are registered trademarks of Intel Corporation. Itanium
-    and Celeron are trademarks of Intel Corporation.
-  </para>
-
-  <para>
-    AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro
-    Devices, Inc.
-  </para>
-
-  <para>
-    Windows is a registered trademark of Microsoft Corporation.
-  </para>
-
-  <para>
-    SSH and Secure Shell are trademarks of SSH Communications Security, Inc.
-  </para>
-
-  <para>
-    FireWire is a trademark of Apple Computer Corporation.
-  </para>
-
-  <para>
-    All other trademarks and copyrights referred to are the property of their
-    respective owners.
-  </para>
-
+&LEGALNOTICE-CONTENT;
 </legalnotice>
diff --git a/common/legalnotice-relnotes-en.xml b/common/legalnotice-relnotes-en.xml
new file mode 100644
index 0000000..989bfce
--- /dev/null
+++ b/common/legalnotice-relnotes-en.xml
@@ -0,0 +1,15 @@
+<!-- $Id: -->
+<!--
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+ <!ENTITY BOILERPLATE "This header makes editing XML easier" >
+
+]>
+-->
+<legalnotice id="legalnotice">
+  <para> This document is released under the terms of the GNU Free Documentation
+    License.  For more details, read the full legalnotice in <xref
+      linkend="ax-legalnotice" />.
+  </para>
+</legalnotice>