diff options
author | Paul W. Frields <stickster@gmail.com> | 2006-02-12 21:58:49 +0000 |
---|---|---|
committer | Paul W. Frields <stickster@gmail.com> | 2006-02-12 21:58:49 +0000 |
commit | 2724dc7cef2a87dff63b468573c8f4f93a7b5a94 (patch) | |
tree | a0931de8c9209cc196102e64725e532f3b003167 /common | |
parent | 9342957cf7a3367139305f2be5f963870fa70f18 (diff) | |
download | fedora-doc-utils-2724dc7cef2a87dff63b468573c8f4f93a7b5a94.tar.gz fedora-doc-utils-2724dc7cef2a87dff63b468573c8f4f93a7b5a94.tar.xz fedora-doc-utils-2724dc7cef2a87dff63b468573c8f4f93a7b5a94.zip |
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.
Diffstat (limited to 'common')
-rw-r--r-- | common/legalnotice-content-en.xml | 11 | ||||
-rw-r--r-- | common/legalnotice-content-p1-en.xml | 18 | ||||
-rw-r--r-- | common/legalnotice-content-p2-en.xml | 17 | ||||
-rw-r--r-- | common/legalnotice-content-p3-en.xml | 16 | ||||
-rw-r--r-- | common/legalnotice-content-p4-en.xml | 14 | ||||
-rw-r--r-- | common/legalnotice-content-p5-en.xml | 14 | ||||
-rw-r--r-- | common/legalnotice-en.xml | 19 | ||||
-rw-r--r-- | common/legalnotice-opl-en.xml | 12 | ||||
-rw-r--r-- | common/legalnotice-relnotes-en.xml | 10 | ||||
-rw-r--r-- | common/legalnotice-section-en.xml | 18 |
10 files changed, 128 insertions, 21 deletions
diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml index 2d9883b..e57cad7 100644 --- a/common/legalnotice-content-en.xml +++ b/common/legalnotice-content-en.xml @@ -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> --> diff --git a/common/legalnotice-content-p1-en.xml b/common/legalnotice-content-p1-en.xml new file mode 100644 index 0000000..5257ad2 --- /dev/null +++ b/common/legalnotice-content-p1-en.xml @@ -0,0 +1,18 @@ +<?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> diff --git a/common/legalnotice-content-p2-en.xml b/common/legalnotice-content-p2-en.xml new file mode 100644 index 0000000..857ebcb --- /dev/null +++ b/common/legalnotice-content-p2-en.xml @@ -0,0 +1,17 @@ +<?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> diff --git a/common/legalnotice-content-p3-en.xml b/common/legalnotice-content-p3-en.xml new file mode 100644 index 0000000..06118de --- /dev/null +++ b/common/legalnotice-content-p3-en.xml @@ -0,0 +1,16 @@ +<?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@MegaCoder.com</email> + created the callout graphics. They all may be freely redistributed with + documentation produced for the &PROJECT;. +</para> diff --git a/common/legalnotice-content-p4-en.xml b/common/legalnotice-content-p4-en.xml new file mode 100644 index 0000000..cc249aa --- /dev/null +++ b/common/legalnotice-content-p4-en.xml @@ -0,0 +1,14 @@ +<?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> diff --git a/common/legalnotice-content-p5-en.xml b/common/legalnotice-content-p5-en.xml new file mode 100644 index 0000000..d00fb42 --- /dev/null +++ b/common/legalnotice-content-p5-en.xml @@ -0,0 +1,14 @@ +<?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> diff --git a/common/legalnotice-en.xml b/common/legalnotice-en.xml index c5a63b5..35e4a19 100644 --- a/common/legalnotice-en.xml +++ b/common/legalnotice-en.xml @@ -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> diff --git a/common/legalnotice-opl-en.xml b/common/legalnotice-opl-en.xml index ae30d43..1083b69 100644 --- a/common/legalnotice-opl-en.xml +++ b/common/legalnotice-opl-en.xml @@ -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> diff --git a/common/legalnotice-relnotes-en.xml b/common/legalnotice-relnotes-en.xml index 90063c1..396aebf 100644 --- a/common/legalnotice-relnotes-en.xml +++ b/common/legalnotice-relnotes-en.xml @@ -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; ]> ---> <!-- diff --git a/common/legalnotice-section-en.xml b/common/legalnotice-section-en.xml index aacfbe8..d72a2f4 100644 --- a/common/legalnotice-section-en.xml +++ b/common/legalnotice-section-en.xml @@ -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> |