docs-common/common legalnotice-content-en.xml,1.1,1.2

[Karsten Wade (kwade)]

Author: kwade

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

Modified Files:
	legalnotice-content-en.xml 
Log Message:
I know of my own knowledge that Red Hat legal has approved this identical change to the Red Hat Enterprise Linux legalnotice, as evidenced by the changes to said notice in Enterprise Linux 4.  I am backporting these changes to the derivative legalnotice for Fedora documentation.  This change does not reduce or increase our legal obligation, afaik.  This does not change the substance of this legalnotice in anyway.  IANAL.


Index: legalnotice-content-en.xml
===================================================================
RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- legalnotice-content-en.xml	3 Jun 2005 03:43:08 -0000	1.1
+++ legalnotice-content-en.xml	31 Oct 2005 15:43:23 -0000	1.2
@@ -29,6 +29,13 @@
   </para>
 
   <para>
+    &RH; and the &RH; "Shadow Man" logo are registered trademarks of
+    &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
@@ -64,7 +71,7 @@
   <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.