summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Wade <kwade@redhat.com>2005-10-31 15:43:23 +0000
committerKarsten Wade <kwade@redhat.com>2005-10-31 15:43:23 +0000
commit0edfc5439caec3c73d07c56fc9d0bd98c4011a56 (patch)
tree0b3c0cd58aa00b3b1259069699726bd33b3c813e
parent6643d8d17f93d1de25460746c3ca5849e8bc1b23 (diff)
downloadfedora-doc-utils-0edfc5439caec3c73d07c56fc9d0bd98c4011a56.tar.gz
fedora-doc-utils-0edfc5439caec3c73d07c56fc9d0bd98c4011a56.tar.xz
fedora-doc-utils-0edfc5439caec3c73d07c56fc9d0bd98c4011a56.zip
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.FC-5-TEST1-LATEST
-rw-r--r--common/legalnotice-content-en.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml
index 4e4662e..016fa8a 100644
--- a/common/legalnotice-content-en.xml
+++ b/common/legalnotice-content-en.xml
@@ -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.