diff options
author | Karsten Wade <kwade@redhat.com> | 2006-02-07 21:18:48 +0000 |
---|---|---|
committer | Karsten Wade <kwade@redhat.com> | 2006-02-07 21:18:48 +0000 |
commit | b7e98b94dd743a0a37b2f84d32cbf49504295f14 (patch) | |
tree | fb0870295ff92bdd58b6cb540d1758e017eb9378 /common/legalnotice-content-en.xml | |
parent | 4d791a98aca429aa67f7c77495cd91e7ec309afe (diff) | |
download | fedora-doc-utils-b7e98b94dd743a0a37b2f84d32cbf49504295f14.tar.gz fedora-doc-utils-b7e98b94dd743a0a37b2f84d32cbf49504295f14.tar.xz fedora-doc-utils-b7e98b94dd743a0a37b2f84d32cbf49504295f14.zip |
Changes toward making the XInclude version work, perhaps all need to be valid XML docs.
Diffstat (limited to 'common/legalnotice-content-en.xml')
-rw-r--r-- | common/legalnotice-content-en.xml | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml index a299d60..00a9a7e 100644 --- a/common/legalnotice-content-en.xml +++ b/common/legalnotice-content-en.xml @@ -1,4 +1,3 @@ - <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 @@ -22,7 +21,7 @@ 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> + </para> <para> &DOCID; @@ -33,45 +32,6 @@ &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 - trademarks of &FORMAL-RHI; in the United States and other countries. - </para> - - <para> - Linux is a registered trademark of Linus Torvalds. - </para> - - <para> - Motif and UNIX are registered trademarks of The Open Group. - </para> - - <para> - Intel and Pentium are registered trademarks of Intel Corporation. Itanium - and Celeron are trademarks of Intel Corporation. - </para> - - <para> - AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro - Devices, Inc. - </para> - - <para> - Windows is a registered trademark of Microsoft Corporation. - </para> - - <para> - SSH and Secure Shell are trademarks of SSH Communications Security, Inc. - </para> - - <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. |