docs-common/common legalnotice-content-en.xml, 1.3, 1.4 legalnotice-section-en.xml, 1.1, 1.2
Karsten Wade (kwade)
fedora-docs-commits at redhat.com
Tue Feb 7 21:18:57 UTC 2006
Author: kwade
Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21644
Modified Files:
legalnotice-content-en.xml legalnotice-section-en.xml
Log Message:
Changes toward making the XInclude version work, perhaps all need to be valid XML docs.
Index: legalnotice-content-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- legalnotice-content-en.xml 28 Dec 2005 00:36:35 -0000 1.3
+++ legalnotice-content-en.xml 7 Feb 2006 21:18:48 -0000 1.4
@@ -1,4 +1,3 @@
-
<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
@@ -22,7 +21,7 @@
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;.
- </para>
+ </para>
<para>
&DOCID;
@@ -33,45 +32,6 @@
&FORMAL-RHI; in the United States and other countries.
</para>
-<!-- Changing to match RHEL usage, changes are drawn directly from existing -->
-<!-- lawyer-approved changes within the RHEL legalnotice:
- <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.
Index: legalnotice-section-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-section-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- legalnotice-section-en.xml 24 Oct 2005 13:56:48 -0000 1.1
+++ legalnotice-section-en.xml 7 Feb 2006 21:18:48 -0000 1.2
@@ -1,3 +1,12 @@
+<?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"[
+
+<!-- *************** COMMON FDP entities *************** -->
+ <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "./fedora-entities-en.ent">
+ %FEDORA-ENTITIES-EN;
+
+]>
<!--
Use this legalnotice for no-chunks/single-page HTML output. It is an optional
@@ -11,6 +20,7 @@
-->
<section id="sn-legalnotice">
- <title>Legalnotice</title>
- &LEGALNOTICE-CONTENT;
+ <title>Legal Notice</title>
+ <xi:include href="./legalnotice-content-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
</section>
More information about the Fedora-docs-commits
mailing list