aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-09 15:09:16 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-09 15:09:16 +0000
commitdf1249e901c9b45b117a2925a9cd2607ad3403b2 (patch)
treea1acd39f10412b61a2013109cdfbb6678905b7a7
parent4937dd7f4bd04a9ff1567a1e903f839c43ac136e (diff)
Add reference to the latest trademark policy on digium.com
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@42555 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--LICENSE3
-rw-r--r--README5
2 files changed, 6 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index a30b79413..8d37096f9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -38,7 +38,8 @@ and use of them is subject to our trademark licensing policies. If you
wish to use these trademarks for purposes other than simple
redistribution of Asterisk source code obtained from Digium, you
should contact our licensing department to determine the necessary
-steps you must take.
+steps you must take. For more information on this policy, please read
+http://www.digium.com/en/company/profile/trademarkpolicy.php
If you have any questions regarding our licensing policy, please
contact us:
diff --git a/README b/README
index 43bb9eec9..7a3440eee 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-The Asterisk Open Source PBX
+The Asterisk(R) Open Source PBX
by Mark Spencer <markster@digium.com>
and the Asterisk.org developer community
@@ -247,3 +247,6 @@ you're interested in getting more information.
Welcome to the growing worldwide community of Asterisk users!
Mark Spencer
+
+----
+Asterisk is a trademark belonging to Digium, inc