docs-common/common legalnotice-content-p1-en.xml, NONE, 1.1 legalnotice-content-p2-en.xml, NONE, 1.1 legalnotice-content-p3-en.xml, NONE, 1.1 legalnotice-content-p4-en.xml, NONE, 1.1 legalnotice-content-p5-en.xml, NONE, 1.1 legalnotice-content-en.xml, 1.7, 1.8 legalnotice-en.xml, 1.11, 1.12 legalnotice-opl-en.xml, 1.2, 1.3 legalnotice-relnotes-en.xml, 1.7, 1.8 legalnotice-section-en.xml, 1.4, 1.5
Paul W. Frields (pfrields)
fedora-docs-commits at redhat.com
Sun Feb 12 21:58:57 UTC 2006
Author: pfrields
Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997/common
Modified Files:
legalnotice-content-en.xml legalnotice-en.xml
legalnotice-opl-en.xml legalnotice-relnotes-en.xml
legalnotice-section-en.xml
Added Files:
legalnotice-content-p1-en.xml legalnotice-content-p2-en.xml
legalnotice-content-p3-en.xml legalnotice-content-p4-en.xml
legalnotice-content-p5-en.xml
Log Message:
This makes everything work out nicely, PROVIDED that doc authors don't use &FDP-INFO; any more, and instead use a standard XInclude statement. Shouldn't cause much pain at all.
--- NEW FILE legalnotice-content-p1-en.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
]>
<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>
--- NEW FILE legalnotice-content-p2-en.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
]>
<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>
--- NEW FILE legalnotice-content-p3-en.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
]>
<para>
Garrett LeSage created the admonition graphics (note, tip, important, 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;.
</para>
--- NEW FILE legalnotice-content-p4-en.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
]>
<para>
&RH; and the &RH; "Shadow Man" logo are registered trademarks of &FORMAL-RHI;
in the United States and other countries.
</para>
--- NEW FILE legalnotice-content-p5-en.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
]>
<para>
All other trademarks and copyrights referred to are the property of their
respective owners.
</para>
Index: legalnotice-content-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- legalnotice-content-en.xml 12 Feb 2006 20:13:38 -0000 1.7
+++ legalnotice-content-en.xml 12 Feb 2006 21:58:49 -0000 1.8
@@ -1,9 +1,16 @@
<?xml version='1.0' encoding='UTF-8'?>
+<!-- $Id: -->
+<!--
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML 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>
+ <title>Legal Notice</title> -->
<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
@@ -48,4 +55,4 @@
All other trademarks and copyrights referred to are the property of their
respective owners.
</para>
-</section>
+<!-- </section> -->
Index: legalnotice-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-en.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- legalnotice-en.xml 12 Feb 2006 20:13:38 -0000 1.11
+++ legalnotice-en.xml 12 Feb 2006 21:58:49 -0000 1.12
@@ -1,11 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: -->
-<!--
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+%FEDORA-ENTITIES-EN;
+
]>
--->
+
<legalnotice id="legalnotice">
- <xi:include href="./legalnotice-content-en.xml" xpointer="element(sn-legalnotice-content)"
+ <xi:include href="legalnotice-content-p1-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p2-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p3-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p4-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p5-en.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</legalnotice>
Index: legalnotice-opl-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-opl-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- legalnotice-opl-en.xml 12 Feb 2006 20:13:38 -0000 1.2
+++ legalnotice-opl-en.xml 12 Feb 2006 21:58:49 -0000 1.3
@@ -1,12 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: -->
-<!--
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
- <!ENTITY BOILERPLATE "This header makes editing XML easier" >
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+%FEDORA-ENTITIES-EN;
]>
--->
<legalnotice id="legalnotice-opl">
-&LEGALNOTICE-OPL-CONTENT;
+ &LEGALNOTICE-OPL-CONTENT;
</legalnotice>
Index: legalnotice-relnotes-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-relnotes-en.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- legalnotice-relnotes-en.xml 12 Feb 2006 20:13:38 -0000 1.7
+++ legalnotice-relnotes-en.xml 12 Feb 2006 21:58:49 -0000 1.8
@@ -1,12 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: -->
-<!--
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
- <!ENTITY BOILERPLATE "This header makes editing XML easier" >
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+%FEDORA-ENTITIES-EN;
]>
--->
<!--
Index: legalnotice-section-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-section-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- legalnotice-section-en.xml 12 Feb 2006 20:13:38 -0000 1.4
+++ legalnotice-section-en.xml 12 Feb 2006 21:58:49 -0000 1.5
@@ -1,4 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
+<!-- $Id: -->
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
@@ -19,9 +20,18 @@
a <section> is otherwise allowed. One good location is immediately following
an introduction.
- -->
- <section id="sn-legalnotice">
+-->
+
+<section id="sn-legalnotice">
<title>Legal Notice</title>
- <xi:include href="./legalnotice-content-en.xml" xpointer="element(sn-legalnotice-content)"
+ <xi:include href="legalnotice-content-p1-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p2-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p3-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p4-en.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="legalnotice-content-p5-en.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- </section>
+</section>
More information about the Fedora-docs-commits
mailing list