On Thu, 17 May 2007, Peter Jones wrote:
"diff -u", dude.
attached as diff.txt
A spell checker might be a good idea, too.
yeah. thanks :-)
--- old.txt 2007-05-16 12:15:43.000000000 -0400
+++ new.txt 2007-05-17 13:24:15.000000000 -0400
@@ -1,5 +1,5 @@
LICENSE AGREEMENT
- FEDORA(TM) CORE
+ FEDORA(TM)
This agreement governs the download, installation or use of the Software
(as defined below) and any updates to the Software, regardless of the
@@ -9,13 +9,16 @@
General Public License. By downloading, installing or using the
Software, User agrees to the terms of this agreement.
-1. THE SOFTWARE. Fedora Core (the "Software") is a modular Linux
+1. THE SOFTWARE. Fedora (the "Software") is a modular Linux
operating system consisting of hundreds of software components.
The end user license agreement for each component is located in
the component's source code. With the exception of certain image
files containing the Fedora trademark identified in Section 2
- below, the license terms for the components permit User to copy,
- modify, and redistribute the component, in both source code and
+ below, the license terms for the components permit User to copy
+ and redistribute the component. With the exception of certain
+ firmware files (denoted in the License field of the RPM packaging),
+ the license terms for the components permit User to copy, modify
+ and redistribute the component, in both source code and
binary code forms. This agreement does not limit User's rights
under, or grant User rights that supersede, the license terms of
any particular component.
@@ -35,9 +38,7 @@
trademark guidelines when distributing the Software, regardless of
whether the Software has been modified. If User modifies the
Software, then User must replace all images containing the
- "Fedora" trademark. Those images are found in the anaconda-images
- and the fedora-logos packages. Merely deleting these files may
- corrupt the Software.
+ "Fedora" trademark. Those images are in the fedora-logos package.
3. LIMITED WARRANTY. Except as specifically stated in this agreement
or a license for a particular component, TO THE MAXIMUM EXTENT
@@ -63,7 +64,7 @@
export controls under the U.S. Commerce Department's Export
Administration Regulations ("EAR"); (b) is not located in a
prohibited destination country under the EAR or U.S. sanctions
- regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan
+ regulations (currently Cuba, Iran, Iraq, North Korea, Sudan
and Syria); (c) will not export, re-export, or transfer the
Software to any prohibited destination, entity, or individual
without the necessary export license(s) or authorizations(s) from
@@ -89,7 +90,7 @@
Nations Convention on the International Sale of Goods shall not
apply.
-Copyright (C) 2003, 2004, 2005 Fedora Project.
+Copyright (C) 2007 Fedora Project.
All rights reserved. "Red Hat" and "Fedora" are trademarks of Red Hat,
Inc. "Linux" is a registered trademark of Linus Torvalds. All other
trademarks are the property of their respective owners.
_______________________________________________
fedora-advisory-board mailing list
fedora-advisory-board@xxxxxxxxxx
http://www.redhat.com/mailman/listinfo/fedora-advisory-board
