From 88059b03f0b1d20f48dcf27cd7a35cbbb63f4f8d Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 6 Sep 2012 15:22:29 -0400 Subject: [PATCH] edits from Tony Sebro - reflowing text - reverting "the between your products and services and those of the Evergreen Project" change Signed-off-by: Galen Charlton --- evergreen-trademark-policy.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/evergreen-trademark-policy.txt b/evergreen-trademark-policy.txt index 675c983..465de60 100644 --- a/evergreen-trademark-policy.txt +++ b/evergreen-trademark-policy.txt @@ -9,9 +9,9 @@ Conservancy ("Conservancy"). Conservancy holds rights in the Marks with its non-profit charitable mission. Conservancy has adopted this Policy to protect the Marks and to -make sure that the identity of the Evergreen software and its free and -open source nature is clear to everyone. By using this Policy, the -Evergreen Project can spread the use of the Evergreen software +make sure that the identity of the Evergreen software and its free +and open source nature is clear to everyone. By using this Policy, +the Evergreen Project can spread the use of the Evergreen software while making sure that the Marks (as defined below) are protected in a way that's consistent with U.S. trademark law. This Policy is written to allow all clear and appropriate use of the Marks while @@ -62,7 +62,7 @@ to the other sections): modifications including but not limited to: the enabling or disabling of certain features by default, translations into other languages, changes required for compatibility with a - particular operating system distribution, or the inclusion of + particular operating system distribution, or the inclusion of bug-fix patches. 2. To identify the Evergreen software as a distinct component of a @@ -100,9 +100,9 @@ display the symbol is waived for this circumstance. You may not use the Marks in any of the following ways without express written permission from Conservancy: - * In any way that creates a likelihood of confusion between your products - and services and those of the Evergreen Project, the provenance of its - software, or the software's license. + * In any way that creates a likelihood of confusion as to the + identity of the Evergreen Project, the provenance of its software, + or the software's license. * In any way that indicates a greater degree of association between you and the Evergreen Project than actually exists. -- 2.11.0