docs-common/common legalnotice-content-p6-en.xml, NONE, 1.1 legalnotice-content-p1-en.xml, 1.1, 1.2 legalnotice-content-p2-en.xml, 1.1, 1.2 legalnotice-content-p3-en.xml, 1.1, 1.2 legalnotice-section-en.xml, 1.5, 1.6

[Karsten Wade (kwade)]

Author: kwade

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

Modified Files:
	legalnotice-content-p1-en.xml legalnotice-content-p2-en.xml 
	legalnotice-content-p3-en.xml legalnotice-section-en.xml 
Added Files:
	legalnotice-content-p6-en.xml 
Log Message:
Updated the legal notice hacks to match the content from the more canonical legalnotice-content-en.xml.


--- NEW FILE legalnotice-content-p6-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>
  Documentation, as with software itself, may be subject to export control.
  Read about Fedora Project export controls at <ulink
  url="http://fedoraproject.org/wiki/Legal/Export">http://fedoraproject.org/wiki/Legal/Export</ulink>.
</para>


Index: legalnotice-content-p1-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-p1-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- legalnotice-content-p1-en.xml	12 Feb 2006 21:58:49 -0000	1.1
+++ legalnotice-content-p1-en.xml	20 Feb 2006 21:13:23 -0000	1.2
@@ -9,10 +9,8 @@
 ]>
 
   <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>.
+    Copyright (c) 2006 by Fedora Foundation and others. This material may be
+    distributed only subject to the terms and conditions set forth in the Open
+    Publication License, v1.0, available at <ulink
+    url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>).
   </para>


Index: legalnotice-content-p2-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-p2-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- legalnotice-content-p2-en.xml	12 Feb 2006 21:58:49 -0000	1.1
+++ legalnotice-content-p2-en.xml	20 Feb 2006 21:13:23 -0000	1.2
@@ -9,9 +9,8 @@
 ]>
 
 <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.
+  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; --> Fedora Project.  
 </para>


Index: legalnotice-content-p3-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-p3-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- legalnotice-content-p3-en.xml	12 Feb 2006 21:58:49 -0000	1.1
+++ legalnotice-content-p3-en.xml	20 Feb 2006 21:13:23 -0000	1.2
@@ -9,8 +9,7 @@
 ]>
 
 <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;.
+  FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of Red Hat, Inc.,
+  are registered or pending registration in the U.S. and other countries, and
+  are used here under license to the Fedora Foundation.
 </para>


Index: legalnotice-section-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-section-en.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- legalnotice-section-en.xml	12 Feb 2006 21:58:49 -0000	1.5
+++ legalnotice-section-en.xml	20 Feb 2006 21:13:23 -0000	1.6
@@ -34,4 +34,7 @@
     xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="legalnotice-content-p5-en.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="legalnotice-content-p6-en.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>
+