Mailing List Archive

Author: quinlan
Date: Wed Aug 11 23:52:09 2004
New Revision: 36275

Modified:
spamassassin/trunk/TRADEMARK
Log:
bug 3630: tweak text to match Apache License 2.0 better


Modified: spamassassin/trunk/TRADEMARK
==============================================================================
--- spamassassin/trunk/TRADEMARK (original)
+++ spamassassin/trunk/TRADEMARK Wed Aug 11 23:52:09 2004
@@ -1,5 +1,3 @@
-Trademark Notice and Disclaimer:
-
Guidelines for Use of the SpamAssassin Trademark

The goal of these guidelines is to minimize the likelihood that email
@@ -12,8 +10,9 @@
What do these guidelines cover?

These guidelines explain how you can use the trademark SpamAssassin to
-refer to the SpamAssassin software, either as an adjunct to or as an
-integrated part of your product. All such use is at your own risk.
+refer to the SpamAssassin software as required for reasonable and
+customary use in describing the origin of the software and reproducing
+the content of the NOTICE file. All such use is at your own risk.
Without advance written permission from the Apache Software Foundation,
you may not use the SpamAssassin trademark, logos, or artwork for any
other purpose. Under no circumstances may you use SpamAssassin in or as