docs-common/common legalnotice-content-en.xml,1.8,1.9

[Karsten Wade (kwade)]

Author: kwade

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

Modified Files:
	legalnotice-content-en.xml 
Log Message:
*docs* Milestone -- changing licensing in CVS license to OPL.  Note that you want to use an earlier version to build existing documentst that do not yet have agreement from copyright holders to relicense.  Pobably best not to rebuild those docs anyway, but over the next few weeks it could be necessary until we remove all non-OPL content entirely.  This notice now uses the OPL, references the Fedora trademarks, continues to reference Red Hat trademarks, and now has a pointer to the export control section of fp.org.


Index: legalnotice-content-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- legalnotice-content-en.xml	12 Feb 2006 21:58:49 -0000	1.8
+++ legalnotice-content-en.xml	20 Feb 2006 18:16:59 -0000	1.9
@@ -11,21 +11,12 @@
 
 <section id="sn-legalnotice-content">
   <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
-    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.
+    Copyright (c) 2006 by Fedora Foundation. This material may be distributed
+    only subject to the terms and conditions set forth in the Open Publication
+    License, v1.0 or later (the latest version is presently available at <ulink
+    url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>)."
   </para>
 
   <para>
@@ -47,6 +38,12 @@
   </para>
 -->
   <para>
+    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>
+
+  <para>
     Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
     Red Hat, Inc. in the United States and other countries.
   </para>
@@ -55,4 +52,20 @@
     All other trademarks and copyrights referred to are the property of their
     respective owners.
   </para>
+
+  <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>
 <!-- </section> -->
+<!--
+
+
+
+
+
+
+
+
+-->